From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp51.i.mail.ru (smtp51.i.mail.ru [94.100.177.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 4DC9843D678 for ; Thu, 24 Oct 2019 02:40:41 +0300 (MSK) Date: Thu, 24 Oct 2019 02:40:32 +0300 From: Alexander Turenko Message-ID: <20191023234031.ilh4xtuehzcttibz@tkn_work_nb> References: <702377579a50dbd8566542652d0b05baa62a0e2d.1570103318.git.avtikhon@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <702377579a50dbd8566542652d0b05baa62a0e2d.1570103318.git.avtikhon@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH v1] build: added centos 8 List-Id: Tarantool development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Alexander V. Tikhonov" Cc: tarantool-patches@freelists.org, tarantool-patches@dev.tarantool.org On Thu, Oct 03, 2019 at 02:49:36PM +0300, Alexander V. Tikhonov wrote: > Implemented ability to build CentOS 8 image ready for > Packpack use. Added CentOS 8 into regular testing under gitlab-ci. I don't got the first sentence. Packpack provides build images and a tool to use them. It is not something that a user need to use tarantool. > > Closes #4543 > --- > > Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4543-centos8 > Issue: https://github.com/tarantool/tarantool/issues/4534 > > .gitlab-ci.yml | 6 ++++++ We should add it to Travis-CI too, because deployments are made only from Travis-CI. > rpm/tarantool.spec | 9 ++++++++- > 2 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 431730b67..655e68cdc 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -152,6 +152,12 @@ centos_7: > OS: 'el' > DIST: '7' > > +centos_8: > + <<: *deploy_test_definition > + variables: > + OS: 'el' > + DIST: '8' > + > fedora_28: > <<: *deploy_test_definition > variables: > diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec > index 10daf1458..5d9277576 100644 > --- a/rpm/tarantool.spec > +++ b/rpm/tarantool.spec > @@ -15,7 +15,9 @@ BuildRequires: gcc-c++ >= 4.5 > BuildRequires: coreutils > BuildRequires: sed > BuildRequires: readline-devel > +%if (0%{?fedora} > 0 || 0%{?rhel} <= 7) > BuildRequires: libyaml-devel > +%endif It will work only for 2.2+, see the comment re PowerTools in https://github.com/packpack/packpack-docker-images/pull/39 > BuildRequires: openssl-devel > BuildRequires: libicu-devel > #BuildRequires: msgpuck-devel > @@ -64,12 +66,17 @@ BuildRequires: libunwind-devel > %endif > > # For tests > -%if (0%{?fedora} >= 22 || 0%{?rhel} >= 7) > +%if (0%{?fedora} >= 22 || 0%{?rhel} == 7) > BuildRequires: python >= 2.7 > BuildRequires: python-six >= 1.9.0 > BuildRequires: python-gevent >= 1.0 > BuildRequires: python-yaml >= 3.0.9 > %endif > +%if (0%{?fedora} >= 22 || 0%{?rhel} >= 8) It seems it should be done only on rhel >= 8, not on Fedora. > +BuildRequires: python2 >= 2.7 > +BuildRequires: python2-six >= 1.9.0 > +BuildRequires: python2-yaml >= 3.0.9 We should provide python2-gevent anyway: let's add to to backports repository in https://packagecloud.io/packpack/backports > +%endif > > Name: tarantool > # ${major}.${major}.${minor}.${patch}, e.g. 1.6.8.175 > -- > 2.17.1 >