Commit e213d77f authored by Mihai Patrascoiu's avatar Mihai Patrascoiu
Browse files

Add CentOS 8 build

parent f85a786b
Pipeline #1986377 failed with stages
in 28 minutes and 27 seconds
......@@ -36,6 +36,21 @@ deps-cc7:
paths:
- "$CI_JOB_NAME"
deps-c8:
stage: deps
image: gitlab-registry.cern.ch/linuxsupport/c8-base
script:
- dnf install -y rpmdevtools python3-devel python3-setuptools sudo tar yum-utils
- dnf builddep -y eos-folly-deps.spec
- mkdir -p ~/rpmbuild/SOURCES
- cp SConstruct.double-conversion ~/rpmbuild/SOURCES
- rpmbuild -ba --undefine=_disable_source_fetch eos-folly-deps.spec
- mkdir "$CI_JOB_NAME"
- cp -r /root/rpmbuild/RPMS/ /root/rpmbuild/SRPMS/ "$CI_JOB_NAME"
artifacts:
paths:
- "$CI_JOB_NAME"
deps-fedora-29:
stage: deps
image: fedora:29
......@@ -152,6 +167,24 @@ cc7:
paths:
- "$CI_JOB_NAME"
c8:
stage: build
image: gitlab-registry.cern.ch/linuxsupport/c8-base
dependencies:
- deps-c8
script:
- dnf install -y rpmdevtools python3-devel python3-setuptools sudo tar yum-utils
- dnf install -y deps-"$CI_JOB_NAME"/RPMS/x86_64/*
- dnf builddep -y eos-folly.spec
- mkdir -p ~/rpmbuild/SOURCES
- cp 0001-Apply-SLC6-patches.patch ~/rpmbuild/SOURCES
- rpmbuild -ba --undefine=_disable_source_fetch eos-folly.spec
- mkdir "$CI_JOB_NAME"
- cp -r /root/rpmbuild/RPMS/ /root/rpmbuild/SRPMS/ "$CI_JOB_NAME"
artifacts:
paths:
- "$CI_JOB_NAME"
fedora-29:
stage: build
image: fedora:29
......@@ -252,11 +285,13 @@ publish:
stage: publish
image: gitlab-registry.cern.ch/linuxsupport/cc7-base
dependencies:
- deps-c8
- deps-fedora-29
- deps-fedora-30
- deps-fedora-31
- deps-fedora-31-tsan
- deps-fedora-rawhide
- c8
- fedora-29
- fedora-30
- fedora-31
......@@ -268,6 +303,7 @@ publish:
script:
- yum install -y tree sudo sssd-client createrepo
- sudo -u stci -s tree
- sudo -u stci -s ${PWD}/deploy-rpms.sh c8 el-8
- sudo -u stci -s ${PWD}/deploy-rpms.sh fedora-29 fc-29
- sudo -u stci -s ${PWD}/deploy-rpms.sh fedora-30 fc-30
- sudo -u stci -s ${PWD}/deploy-rpms.sh fedora-31 fc-31
......@@ -292,3 +328,4 @@ publish-critical:
- sudo -u stci -s tree
- sudo -u stci -s ${PWD}/deploy-rpms.sh slc6 el-6
- sudo -u stci -s ${PWD}/deploy-rpms.sh cc7 el-7
%define distribution %(/usr/lib/rpm/redhat/dist.sh --distnum)
%define scons_package scons
%define scons scons
%if 0%{distribution} == 8
%define scons_package python3-scons
%define scons scons-3
%endif
#-------------------------------------------------------------------------------
# Custom strip command for SLC6, CC7
......@@ -32,7 +39,7 @@ BuildRequires: zlib-devel
BuildRequires: m4
BuildRequires: automake
BuildRequires: libtool
BuildRequires: scons
BuildRequires: %{scons_package}
BuildRequires: openssl
BuildRequires: openssl-devel
BuildRequires: libevent
......@@ -110,7 +117,7 @@ popd
# Compile double-conversion
#-------------------------------------------------------------------------------
pushd double-conversion-1.1.6
scons -f %{SOURCE4}
%{scons} -f %{SOURCE4}
%{__install} -D -m 755 ./libdouble_conversion.a ${TEMP_ROOT}/lib/libdouble-conversion.a
%{__install} -D -m 755 ./libdouble_conversion_pic.a ${TEMP_ROOT}/lib/libdouble-conversion_pic.a
......@@ -192,6 +199,7 @@ popd
/opt/eos-folly/*
%changelog
* Wed Jan 15 2020 Mihai Patrascoiu <mihai.patrascoiu@cern.ch> - 0.0.2
- Accommodate CentOS 8 build
* Wed Nov 27 2019 Georgios Bitzes <georgios.bitzes@cern.ch> - 0.0.1
- Initial package
......@@ -27,7 +27,6 @@ BuildRequires: zlib-devel
BuildRequires: m4
BuildRequires: automake
BuildRequires: libtool
BuildRequires: scons
BuildRequires: openssl
BuildRequires: openssl-devel
BuildRequires: libevent
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment