From 43a7f5701232f32011dede68574eb107f31a9a57 Mon Sep 17 00:00:00 2001 From: Reiner Hauser <Reiner.Hauser@cern.ch> Date: Mon, 29 May 2023 13:29:30 +0200 Subject: [PATCH 1/2] Add gcc13 builds for dev4, use el9 for all dev4 builds --- .gitlab-ci.yml | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 560ef54a..bf50c666 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -247,6 +247,8 @@ build/x86_64-centos9-gcc11-opt: - tdaq-large-8 variables: CMTCONFIG: x86_64-centos9-gcc11-opt + rules: + - if: $DEV == null build/x86_64-centos9-gcc11-dbg: extends: .build @@ -255,12 +257,16 @@ build/x86_64-centos9-gcc11-dbg: - tdaq-large-8 variables: CMTCONFIG: x86_64-centos9-gcc11-dbg + rules: + - if: $DEV == null build/x86_64-centos7-gcc12-opt: extends: .build image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:x86_64-centos7 variables: CMTCONFIG: x86_64-centos7-gcc12-opt + rules: + - if: $DEV == null build/x86_64-centos9-gcc12-opt: extends: .build @@ -269,6 +275,8 @@ build/x86_64-centos9-gcc12-opt: image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:x86_64-el9 variables: CMTCONFIG: x86_64-centos9-gcc12-opt + rules: + - if: $DEV == null .build/x86_64-centos7-clang12-opt: extends: .build @@ -306,19 +314,42 @@ build/aarch64-centos9-gcc11-opt: image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:aarch64-el9 variables: CMTCONFIG: aarch64-centos9-gcc11-opt + rules: + - if: $DEV == null + +build/aarch64-el9-gcc11-opt: + extends: .build-aarch64 + image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:aarch64-el9 + variables: + CMTCONFIG: aarch64-el9-gcc11-opt + TDAQ_OS_ID: el + rules: + - if: $DEV # special el9 build tag -build/x86_64-el9-gcc11-opt: +build/x86_64-el9-gcc13-opt: extends: .build image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:x86_64-el9 tags: - tdaq-large-8 variables: - CMTCONFIG: x86_64-el9-gcc11-opt + CMTCONFIG: x86_64-el9-gcc13-opt TDAQ_OS_ID: el rules: - if: $DEV +build/x86_64-el9-gcc13-dbg: + extends: .build + image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:x86_64-el9 + tags: + - tdaq-large-8 + variables: + CMTCONFIG: x86_64-el9-gcc13-dbg + TDAQ_OS_ID: el + rules: + - if: $DEV + + # # This will re-build the whole branch (only for tdaq-99-00-00) on # every commit. It relies on an existing ccache to speed things up. -- GitLab From 28d60cedd1093d43a10dc089bc11502693c105ed Mon Sep 17 00:00:00 2001 From: Reiner Hauser <Reiner.Hauser@cern.ch> Date: Mon, 29 May 2023 13:36:56 +0200 Subject: [PATCH 2/2] Add full rules to dev4 cases --- .gitlab-ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf50c666..5bd446ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -187,7 +187,7 @@ variables: - curl -o db/ldap.ora https://service-oracle-tnsnames.web.cern.ch/service-oracle-tnsnames/ldap.ora - export CORAL_DBLOOKUP_PATH=$PWD/db - export CORAL_AUTH_PATH=$PWD/db - - export TNS_ADMIN=$PWD/db + - export TNS_ADMIN=$PWD/db - export GITROOT=https://gitlab.cern.ch/atlas-tdaq-software - export PATH=/cvmfs/atlas.cern.ch/repo/sw/tdaq/tools/$(uname -i)-centos7/git/2.25.1/bin:$PATH - export CHECKOUT_AREA=`pwd` @@ -210,10 +210,10 @@ variables: - (find build -name '*.java' -type f | tar -cf - -T - | tar -C output -xf -) || true - echo ${OPTIONS} | egrep -q -- '--tar|--rpm' || exit ${result} - rm -rf deploy - - mkdir -p deploy/tar + - mkdir -p deploy/tar - mkdir -p deploy/${TDAQ_VERSION}/${CMTCONFIG} - mkdir -p deploy/${TDAQ_COMMON_VERSION}/${CMTCONFIG} - - cd build + - cd build - shopt -s nullglob - for f in tar/*.tar.gz ; do mv $f ../deploy/tar ; done - for rpm in tdaq-common/*/${CMTCONFIG}/*.rpm ; do mv $rpm ../deploy/${TDAQ_COMMON_VERSION}/${CMTCONFIG} ; done @@ -248,7 +248,7 @@ build/x86_64-centos9-gcc11-opt: variables: CMTCONFIG: x86_64-centos9-gcc11-opt rules: - - if: $DEV == null + - if: ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web") && $PACKAGES == null && $DEV == null build/x86_64-centos9-gcc11-dbg: extends: .build @@ -258,7 +258,7 @@ build/x86_64-centos9-gcc11-dbg: variables: CMTCONFIG: x86_64-centos9-gcc11-dbg rules: - - if: $DEV == null + - if: ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web") && $PACKAGES == null && $DEV == null build/x86_64-centos7-gcc12-opt: extends: .build @@ -266,7 +266,7 @@ build/x86_64-centos7-gcc12-opt: variables: CMTCONFIG: x86_64-centos7-gcc12-opt rules: - - if: $DEV == null + - if: ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web") && $PACKAGES == null && $DEV == null build/x86_64-centos9-gcc12-opt: extends: .build @@ -276,7 +276,7 @@ build/x86_64-centos9-gcc12-opt: variables: CMTCONFIG: x86_64-centos9-gcc12-opt rules: - - if: $DEV == null + - if: ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web") && $PACKAGES == null && $DEV == null .build/x86_64-centos7-clang12-opt: extends: .build @@ -315,7 +315,7 @@ build/aarch64-centos9-gcc11-opt: variables: CMTCONFIG: aarch64-centos9-gcc11-opt rules: - - if: $DEV == null + - if: ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web") && $PACKAGES == null && $DEV == null build/aarch64-el9-gcc11-opt: extends: .build-aarch64 @@ -324,7 +324,7 @@ build/aarch64-el9-gcc11-opt: CMTCONFIG: aarch64-el9-gcc11-opt TDAQ_OS_ID: el rules: - - if: $DEV + - if: ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web") && $PACKAGES == null && $DEV # special el9 build tag build/x86_64-el9-gcc13-opt: @@ -336,7 +336,7 @@ build/x86_64-el9-gcc13-opt: CMTCONFIG: x86_64-el9-gcc13-opt TDAQ_OS_ID: el rules: - - if: $DEV + - if: ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web") && $PACKAGES == null && $DEV build/x86_64-el9-gcc13-dbg: extends: .build @@ -347,7 +347,7 @@ build/x86_64-el9-gcc13-dbg: CMTCONFIG: x86_64-el9-gcc13-dbg TDAQ_OS_ID: el rules: - - if: $DEV + - if: ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web") && $PACKAGES == null && $DEV # -- GitLab