Commit 0e330f8d authored by Fabio Luchetti's avatar Fabio Luchetti
Browse files

Install and use custom cmake v3.17.3 for Fedora>=33 build; Drop fc-29 and...

Install and use custom cmake v3.17.3 for Fedora>=33 build; Drop fc-29 and fc-30; Add fc-32 and fc-32-tsan build
parent e213d77f
Pipeline #2008095 passed with stages
in 35 minutes and 31 seconds
......@@ -51,9 +51,9 @@ deps-c8:
paths:
- "$CI_JOB_NAME"
deps-fedora-29:
deps-fedora-31:
stage: deps
image: fedora:29
image: fedora:31
script:
- dnf install -y rpmdevtools python-devel python-setuptools sudo tar yum-utils
- dnf install -y dnf-plugins-core
......@@ -67,25 +67,25 @@ deps-fedora-29:
paths:
- "$CI_JOB_NAME"
deps-fedora-30:
deps-fedora-31-tsan:
stage: deps
image: fedora:30
image: fedora:31
script:
- dnf install -y rpmdevtools python-devel python-setuptools sudo tar yum-utils
- dnf install -y dnf-plugins-core
- dnf install -y dnf-plugins-core libtsan
- 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
- rpmbuild -ba --undefine=_disable_source_fetch --define '_with_tsan 1' 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-31:
deps-fedora-32:
stage: deps
image: fedora:31
image: fedora:32
script:
- dnf install -y rpmdevtools python-devel python-setuptools sudo tar yum-utils
- dnf install -y dnf-plugins-core
......@@ -99,9 +99,9 @@ deps-fedora-31:
paths:
- "$CI_JOB_NAME"
deps-fedora-31-tsan:
deps-fedora-32-tsan:
stage: deps
image: fedora:31
image: fedora:32
script:
- dnf install -y rpmdevtools python-devel python-setuptools sudo tar yum-utils
- dnf install -y dnf-plugins-core libtsan
......@@ -185,11 +185,12 @@ c8:
paths:
- "$CI_JOB_NAME"
fedora-29:
fedora-31:
stage: build
image: fedora:29
image: fedora:31
dependencies:
- deps-fedora-29
- deps-fedora-31
script:
- dnf install -y rpmdevtools python-devel python-setuptools sudo tar yum-utils
- yum install -y deps-"$CI_JOB_NAME"/RPMS/x86_64/*
......@@ -204,31 +205,30 @@ fedora-29:
paths:
- "$CI_JOB_NAME"
fedora-30:
fedora-31-tsan:
stage: build
image: fedora:30
image: fedora:31
dependencies:
- deps-fedora-30
- deps-fedora-31-tsan
script:
- dnf install -y rpmdevtools python-devel python-setuptools sudo tar yum-utils
- yum install -y deps-"$CI_JOB_NAME"/RPMS/x86_64/*
- dnf install -y dnf-plugins-core
- dnf install -y deps-"$CI_JOB_NAME"/RPMS/x86_64/*
- dnf install -y dnf-plugins-core libtsan
- 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
- rpmbuild -ba --undefine=_disable_source_fetch --define '_with_tsan 1' eos-folly.spec
- mkdir "$CI_JOB_NAME"
- cp -r /root/rpmbuild/RPMS/ /root/rpmbuild/SRPMS/ "$CI_JOB_NAME"
artifacts:
paths:
- "$CI_JOB_NAME"
fedora-31:
fedora-32:
stage: build
image: fedora:31
image: fedora:32
dependencies:
- deps-fedora-31
- deps-fedora-32
script:
- dnf install -y rpmdevtools python-devel python-setuptools sudo tar yum-utils
- yum install -y deps-"$CI_JOB_NAME"/RPMS/x86_64/*
......@@ -243,11 +243,11 @@ fedora-31:
paths:
- "$CI_JOB_NAME"
fedora-31-tsan:
fedora-32-tsan:
stage: build
image: fedora:31
image: fedora:32
dependencies:
- deps-fedora-31-tsan
- deps-fedora-32-tsan
script:
- dnf install -y rpmdevtools python-devel python-setuptools sudo tar yum-utils
- dnf install -y deps-"$CI_JOB_NAME"/RPMS/x86_64/*
......@@ -262,7 +262,6 @@ fedora-31-tsan:
paths:
- "$CI_JOB_NAME"
fedora-rawhide:
stage: build
image: registry.fedoraproject.org/fedora:rawhide
......@@ -286,16 +285,16 @@ 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-32
- deps-fedora-32-tsan
- deps-fedora-rawhide
- c8
- fedora-29
- fedora-30
- fedora-31
- fedora-31-tsan
- fedora-32
- fedora-32-tsan
- fedora-rawhide
tags:
- docker_node
......@@ -304,10 +303,10 @@ publish:
- 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
- sudo -u stci -s ${PWD}/deploy-rpms.sh fedora-31-tsan fc-31-tsan
- sudo -u stci -s ${PWD}/deploy-rpms.sh fedora-32 fc-32
- sudo -u stci -s ${PWD}/deploy-rpms.sh fedora-32-tsan fc-32-tsan
- sudo -u stci -s ${PWD}/deploy-rpms.sh fedora-rawhide fc-rawhide
publish-critical:
......
%define distribution %(/usr/lib/rpm/redhat/dist.sh --distnum)
%define cmake cmake3
#-------------------------------------------------------------------------------
# Custom strip command for SLC6, CC7
......@@ -76,6 +77,16 @@ export CXXFLAGS='-fsanitize=thread -g3 -fPIC'
export CXXFLAGS='-g3 -fPIC'
%endif
# @note EOS-4450
%if 0%{?fedora} >= 33
export TMP="/tmp/"
echo "Installing and using cmake 3.17.3"
curl --location https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh --output $TMP/cmake-3.17.3-Linux-x86_64.sh
chmod +x $TMP/cmake-3.17.3-Linux-x86_64.sh
mkdir -p $TMP/cmake_install/ && $TMP/cmake-3.17.3-Linux-x86_64.sh --prefix="$TMP/cmake_install/" --skip-license
%define cmake $TMP/cmake_install/bin/cmake
%endif
mkdir TEMPROOT
TEMP_ROOT=$PWD/TEMPROOT
......@@ -84,7 +95,7 @@ TEMP_ROOT=$PWD/TEMPROOT
#-------------------------------------------------------------------------------
pushd folly-%{version}
mkdir builddir && cd builddir
cmake3 .. -DCMAKE_PREFIX_PATH=/opt/eos-folly -DCMAKE_INSTALL_PREFIX=/opt/eos-folly
%{cmake} .. -DCMAKE_PREFIX_PATH=/opt/eos-folly -DCMAKE_INSTALL_PREFIX=/opt/eos-folly
make %{?_smp_mflags}
popd
......
This diff is collapsed.
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