From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 B422A46971A for ; Tue, 3 Dec 2019 08:59:45 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Tue, 3 Dec 2019 08:59:43 +0300 Message-Id: <59a36acd7f2aade804e189ee7b403802afaabf48.1575352693.git.avtikhon@tarantool.org> Subject: [Tarantool-patches] [PATCH v2] build: add Fedora 31 into CI / CD List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Turenko Cc: tarantool-patches@dev.tarantool.org Added build + test jobs in GitLab-CI and build + test + deploy jobs on Travis-CI for Fedora 31. Updated testing dependencies in the RPM spec to follow the new Python 2 package naming scheme that was introduced in Fedora 31: it uses python2-' prefix rather then 'python-'. Fedora 31 does not provide python2-gevent and python2-greenlet packages, so they were pushed to https://packagecloud.io/packpack/backports repository. This repository is enabled in our build image (packpack/packpack:fedora-31) by default. Those dependencies are build-time, so nothing was changed for a user. The source RPM packages were gathered from https://rpms.remirepo.net/rpmphp/. Closes #4612 --- Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4612-fedora31-full-ci Issue: https://github.com/tarantool/tarantool/issues/4612 .gitlab-ci.yml | 6 ++++++ .travis.yml | 3 +++ rpm/tarantool.spec | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf13c382e..3af5a3c8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -176,6 +176,12 @@ fedora_30: OS: 'fedora' DIST: '30' +fedora_31: + <<: *deploy_test_definition + variables: + OS: 'fedora' + DIST: '31' + ubuntu_14_04: <<: *deploy_definition variables: diff --git a/.travis.yml b/.travis.yml index d48ef39e0..c2ace2eda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,9 @@ jobs: - name: "Fedora 30 build + test + deploy RPM" env: OS=fedora DIST=30 if: branch = "master" + - name: "Fedora 31 build + test + deploy RPM" + env: OS=fedora DIST=31 + if: branch = "master" - name: "Ubuntu Trusty (14.04) build + deploy DEB" env: OS=ubuntu DIST=trusty if: branch = "master" diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec index edce39115..ff95ed646 100644 --- a/rpm/tarantool.spec +++ b/rpm/tarantool.spec @@ -76,7 +76,7 @@ BuildRequires: python-six >= 1.9.0 BuildRequires: python-gevent >= 1.0 BuildRequires: python-yaml >= 3.0.9 %endif -%if 0%{?rhel} >= 8 +%if (0%{?fedora} >= 31 || 0%{?rhel} >= 8) BuildRequires: python2 >= 2.7 BuildRequires: python2-six >= 1.9.0 BuildRequires: python2-gevent >= 1.0 -- 2.17.1