diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 100bfda0b9876830e772c01aacfc2760888ec837..b540b3240c59c99e5d725f7557e181f07d3efb0d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -156,6 +156,10 @@ variables: # Show test output if it failed CTEST_OUTPUT_ON_FAILURE: "ON" + # This version is considered the production configuration + # For patches we take the noarch and src RPMs from this build. + DEFAULT_CMTCONFIG: "x86_64-el9-gcc13-opt" + # # The common build template, extended once per CMTCONFIG # below. @@ -436,10 +440,11 @@ continuous/x86_64-el9-gcc13-dbg: - rm -f ${CMTCONFIG}/${CI_COMMIT_REF_NAME}-${CMTCONFIG}.rpm - rm -f ${CMTCONFIG}/${CI_COMMIT_REF_NAME}-noarch.rpm - rm -f ${CMTCONFIG}/${CI_COMMIT_REF_NAME}-src.rpm - - rm -f ${CMTCONFIG}/${CI_COMMIT_REF_NAME}-LCGdeps_${CMTCONFIG}.rpm + - rm -f ${CMTCONFIG}/${CI_COMMIT_REF_NAME}-WithoutLCG_${CMTCONFIG}.rpm + - test "${CMTCONFIG}" != "${DEFAULT_CMTCONFIG}" && rm -f ${CMTCONFIG}/*_noarch-*.rpm ${CMTCONFIG}/*_src-*.rpm || /bin/true - echo ${OPTIONS} | grep -q -- '--rpm' || exit 0 - mkdir deploy - - find ${CMTCONFIG} -name *.rpm -exec mv '{}' deploy/ ';' + - find ${CMTCONFIG} -maxdepth 1 -name *.rpm -exec mv '{}' deploy/ ';' - cd deploy - env -u LD_LIBRARY_PATH deploy-eos tags: