diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 560ef54a3f89d1f88fe7bacabae2a186b37fdd98..5bd446ee308f298fb54b5bd4c2fdbcd1a2c0d8f9 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 @@ -247,6 +247,8 @@ build/x86_64-centos9-gcc11-opt: - tdaq-large-8 variables: CMTCONFIG: x86_64-centos9-gcc11-opt + rules: + - if: ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web") && $PACKAGES == null && $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: ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web") && $PACKAGES == null && $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: ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web") && $PACKAGES == null && $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: ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web") && $PACKAGES == null && $DEV == null .build/x86_64-centos7-clang12-opt: extends: .build @@ -306,18 +314,41 @@ 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: ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web") && $PACKAGES == null && $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: ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web") && $PACKAGES == null && $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-gcc13-opt + TDAQ_OS_ID: el + rules: + - if: ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web") && $PACKAGES == null && $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-gcc11-opt + 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 + # # This will re-build the whole branch (only for tdaq-99-00-00) on