From b7475b539541fbf8a6b0ad62c4c0f5e8138ddcdd Mon Sep 17 00:00:00 2001 From: Paul Gessinger <paul.gessinger@cern.ch> Date: Thu, 31 Oct 2024 09:36:21 +0100 Subject: [PATCH 1/3] avoid job dependency problem --- art_tests.yml | 2 +- full_nightly.yml | 4 ++-- hack_nightly.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/art_tests.yml b/art_tests.yml index b517616..092577a 100644 --- a/art_tests.yml +++ b/art_tests.yml @@ -1,7 +1,7 @@ run_art_test: extends: .run_base - needs: [build_acts_athena] + needs: [build] stage: art_tests diff --git a/full_nightly.yml b/full_nightly.yml index 3d0698c..156ac47 100644 --- a/full_nightly.yml +++ b/full_nightly.yml @@ -1,4 +1,4 @@ -build_athena: +build: stage: build tags: @@ -64,7 +64,7 @@ build_athena: when: always - dependencies: [build_acts_athena] + dependencies: [build] artifacts: paths: diff --git a/hack_nightly.yml b/hack_nightly.yml index ca7ac75..e2f5fa1 100644 --- a/hack_nightly.yml +++ b/hack_nightly.yml @@ -1,4 +1,4 @@ -build_acts_athena: +build: stage: build tags: @@ -44,7 +44,7 @@ build_acts_athena: when: always - dependencies: [build_acts_athena] + dependencies: [build] artifacts: paths: -- GitLab From 989586c15dee01367627db6bf80efa6e19aaf22a Mon Sep 17 00:00:00 2001 From: Paul Gessinger <paul.gessinger@cern.ch> Date: Thu, 31 Oct 2024 09:37:45 +0100 Subject: [PATCH 2/3] correctly wire art script exit code --- art/wrapper.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/art/wrapper.sh b/art/wrapper.sh index 28ae484..f09a4e5 100755 --- a/art/wrapper.sh +++ b/art/wrapper.sh @@ -86,11 +86,17 @@ export -f download_latest # ART scripts don't expect to run with -e set +e ${script} +script_ec=$? set -e +if [ $script_ec -ne 0 ]; then + echo "Script failed with exit code $script_ec" +fi + cp "${script}" . if [ -n "${UPLOAD_RESULTS}" ]; then + echo "Uploading results" echo "<h1>ART run</h1>" > README.html @@ -157,3 +163,5 @@ if [ -n "${UPLOAD_RESULTS}" ]; then else echo "Skipping uploading of results" fi + +exit $script_ec -- GitLab From ce2edaaf9240fb99c9984f53775a15af34f8323b Mon Sep 17 00:00:00 2001 From: Paul Gessinger <paul.gessinger@cern.ch> Date: Thu, 31 Oct 2024 14:58:12 +0100 Subject: [PATCH 3/3] add CxxUtils to build --- package_filters_hack.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package_filters_hack.txt b/package_filters_hack.txt index 4b1cb33..75e8568 100644 --- a/package_filters_hack.txt +++ b/package_filters_hack.txt @@ -17,4 +17,6 @@ + Event/xAOD/xAODMeasurementBase + Trigger/EFTracking/EFTrackingDataTransfer ++ .*CxxUtils.* + - .* -- GitLab