Commit f136c838 authored by Fabio Luchetti's avatar Fabio Luchetti
Browse files

CI: Drop fedora 32; Add fedora 33 and 34

parent 288e6c2f
Pipeline #2899026 failed with stages
in 3 minutes and 32 seconds
......@@ -33,9 +33,9 @@ deps-el-8:
paths:
- "$CI_JOB_NAME"
deps-fc-32:
deps-fc-33:
stage: deps
image: fedora:32
image: fedora:33
script:
- dnf install -y rpmdevtools python-devel python-setuptools sudo tar yum-utils
- dnf install -y dnf-plugins-core
......@@ -49,9 +49,41 @@ deps-fc-32:
paths:
- "$CI_JOB_NAME"
deps-fc-32-tsan:
deps-fc-33-tsan:
stage: deps
image: fedora:32
image: fedora:33
script:
- dnf install -y rpmdevtools python-devel python-setuptools sudo tar yum-utils
- 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 --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-fc-34:
stage: deps
image: fedora:34
script:
- dnf install -y rpmdevtools python-devel python-setuptools sudo tar yum-utils
- dnf install -y dnf-plugins-core
- 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-fc-34-tsan:
stage: deps
image: fedora:34
script:
- dnf install -y rpmdevtools python-devel python-setuptools sudo tar yum-utils
- dnf install -y dnf-plugins-core libtsan
......@@ -115,11 +147,11 @@ el-8:
paths:
- "$CI_JOB_NAME"
fc-32:
fc-33:
stage: build
image: fedora:32
image: fedora:33
dependencies:
- deps-fc-32
- deps-fc-33
script:
- dnf install -y rpmdevtools python-devel python-setuptools sudo tar yum-utils
- yum install -y deps-"$CI_JOB_NAME"/RPMS/x86_64/*
......@@ -133,11 +165,47 @@ fc-32:
paths:
- "$CI_JOB_NAME"
fc-32-tsan:
fc-33-tsan:
stage: build
image: fedora:32
image: fedora:33
dependencies:
- deps-fc-32-tsan
- deps-fc-33-tsan
script:
- dnf install -y rpmdevtools python-devel python-setuptools sudo tar yum-utils
- 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
- 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"
fc-34:
stage: build
image: fedora:34
dependencies:
- deps-fc-34
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 builddep -y eos-folly.spec
- mkdir -p ~/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"
fc-34-tsan:
stage: build
image: fedora:34
dependencies:
- deps-fc-34-tsan
script:
- dnf install -y rpmdevtools python-devel python-setuptools sudo tar yum-utils
- dnf install -y deps-"$CI_JOB_NAME"/RPMS/x86_64/*
......@@ -179,15 +247,18 @@ publish:
dependencies:
- deps-el-7
- deps-el-8
- deps-fc-32
- deps-fc-32-tsan
- deps-fc-33
- deps-fc-33-tsan
- deps-fc-34
- deps-fc-34-tsan
- deps-fc-rawhide
- el-7
- el-8
- fc-32
- fc-32-tsan
- fc-33
- fc-33-tsan
- fc-34
- fc-34-tsan
- fc-rawhide
tags:
- docker_node
retry: 2
......@@ -4,7 +4,7 @@ set -ex
EOS_CODENAME="diopside"
STCI_ROOT_PATH=/eos/project/s/storage-ci/www/eos
for BUILD_TYPE in "el-7" "el-8" "fc-32" "fc-32-tsan" ; do
for BUILD_TYPE in "el-7" "el-8" "fc-33" "fc-33-tsan" "fc-34" "fc-34-tsan" ; do
EXPORT_DIR_RPMS=${STCI_ROOT_PATH}/${EOS_CODENAME}-depend/${BUILD_TYPE}/x86_64/
EXPORT_DIR_SRPMS=${STCI_ROOT_PATH}/${EOS_CODENAME}-depend/${BUILD_TYPE}/SRPM/
echo "Publishing for: ${BUILD_TYPE} in location: ${EXPORT_DIR_RPMS}"
......
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