[tarantool-patches] [PATCH v1] build: added centos 8
Alexander V. Tikhonov
avtikhon at tarantool.org
Thu Oct 3 14:49:36 MSK 2019
Implemented ability to build CentOS 8 image ready for
Packpack use. Added CentOS 8 into regular testing under gitlab-ci.
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 ++++++
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
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)
+BuildRequires: python2 >= 2.7
+BuildRequires: python2-six >= 1.9.0
+BuildRequires: python2-yaml >= 3.0.9
+%endif
Name: tarantool
# ${major}.${major}.${minor}.${patch}, e.g. 1.6.8.175
--
2.17.1
More information about the Tarantool-patches
mailing list