diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e56d26a2a087f53abe29999fc11bef6300472673..9de6be441a32f781e3d62222f2c6134e0dc3bb78 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,8 +38,7 @@ test_unittest:
tags:
- k8s-cvmfs
script:
- # Ugly, setup.sh is found before changing to the build directory...
- - set +e && export ALRB_CONT_RUNPAYLOAD="asetup --input=asetup.faser Athena,24.0.41; cd build; source ../`find . -name 'setup.sh'`; ctest -j3" && set -e
+ - set +e && export ALRB_CONT_RUNPAYLOAD="asetup --input=asetup.faser Athena,24.0.41; source `find . -name 'setup.sh'`; cd build; ctest -j3" && set -e
- echo $ALRB_CONT_RUNPAYLOAD
- set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh -c alma9 && set -e
dependencies:
diff --git a/Calorimeter/CaloDetDescr/EcalGeoModel/CMakeLists.txt b/Calorimeter/CaloDetDescr/EcalGeoModel/CMakeLists.txt
index 80e36dabc05dacb19253b6c75c4ac4ec6515d516..b70f0b1945c61cf1dbeafa566562d0679cd3a04e 100644
--- a/Calorimeter/CaloDetDescr/EcalGeoModel/CMakeLists.txt
+++ b/Calorimeter/CaloDetDescr/EcalGeoModel/CMakeLists.txt
@@ -26,7 +26,8 @@ atlas_add_component( EcalGeoModel
atlas_add_test( EcalGMConfig_test
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/EcalGMConfig_test.py
PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT noerror.sh)
# Decide which ecal gdml file to use based on option; tyvek density reduced in EcalTyvek04.gdml (June 2023)
if (ECAL_GEO_TYVEK)
diff --git a/Calorimeter/CaloDetDescr/EcalGeoModel/test/EcalGMConfig_test.py b/Calorimeter/CaloDetDescr/EcalGeoModel/test/EcalGMConfig_test.py
index 94a0ac337a6e3c5fea045076168e61b9dbecc63d..fea727831ef18e030181ab1c5e129c35b4e306bd 100644
--- a/Calorimeter/CaloDetDescr/EcalGeoModel/test/EcalGMConfig_test.py
+++ b/Calorimeter/CaloDetDescr/EcalGeoModel/test/EcalGMConfig_test.py
@@ -10,8 +10,8 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
configFlags = initConfigFlags()
- configFlags.Input.Files = defaultTestFiles.HITS
- configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
+ configFlags.Input.Files = [] # Dummy input
+ configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
configFlags.Detector.EnableEcal = True
#flags.GeoModel.Align.Dynamic = False
configFlags.lock()
diff --git a/Control/CalypsoExample/GeoModelTest/CMakeLists.txt b/Control/CalypsoExample/GeoModelTest/CMakeLists.txt
index b9b37519456d895ddda155051328ed5681505126..81b1f9e6351f801344480c2480b716fd887d0019 100644
--- a/Control/CalypsoExample/GeoModelTest/CMakeLists.txt
+++ b/Control/CalypsoExample/GeoModelTest/CMakeLists.txt
@@ -18,32 +18,45 @@ atlas_add_component( GeoModelTest
atlas_add_test( Faser01GeoCheck
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/python/Faser01TestConfig.py
PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT noerror.sh
+ )
+
atlas_add_test( Faser02GeoCheck
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/python/Faser02TestConfig.py
PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT noerror.sh
+ )
atlas_add_test( Faser03GeoCheck
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/python/Faser03TestConfig.py
PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT noerror.sh
+ )
atlas_add_test( Faser04GeoCheck
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/python/Faser04TestConfig.py
PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT noerror.sh
+ )
atlas_add_test( TestBeam00GeoCheck
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/python/TestBeam00TestConfig.py
PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT noerror.sh
+ )
atlas_add_test( TestBeam01GeoCheck
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/python/TestBeam01TestConfig.py
PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT noerror.sh
+ )
# Install files from the package:
#atlas_install_headers( GeoModelTest )
diff --git a/Control/CalypsoExample/GeoModelTest/python/Faser01TestConfig.py b/Control/CalypsoExample/GeoModelTest/python/Faser01TestConfig.py
index e14d1a2dfd6f0aa5e53925f1aa078fcdd31038c9..2e36dd757d9a157abf1b8e8a70cefd7c4fc31d0b 100644
--- a/Control/CalypsoExample/GeoModelTest/python/Faser01TestConfig.py
+++ b/Control/CalypsoExample/GeoModelTest/python/Faser01TestConfig.py
@@ -45,6 +45,8 @@ if __name__ == "__main__":
# configFlags.Detector.EnableCentralDipole = True
# configFlags.Detector.EnableDownstreamDipole = True
# configFlags.Detector.EnableEcal = True
+
+ configFlags.Input.Files = [] # Dummy input
configFlags.lock()
# Configure components
diff --git a/Control/CalypsoExample/GeoModelTest/python/Faser02TestConfig.py b/Control/CalypsoExample/GeoModelTest/python/Faser02TestConfig.py
index 39461b36c4d1520630037c336bd609e2910f9e2b..19406d9c9ff67557e1d81c7e2fc41a6511cf6be0 100644
--- a/Control/CalypsoExample/GeoModelTest/python/Faser02TestConfig.py
+++ b/Control/CalypsoExample/GeoModelTest/python/Faser02TestConfig.py
@@ -46,6 +46,7 @@ if __name__ == "__main__":
# configFlags.Detector.EnableCentralDipole = True
# configFlags.Detector.EnableDownstreamDipole = True
# configFlags.Detector.EnableEcal = True
+ configFlags.Input.Files = [] # Dummy input
configFlags.lock()
# Configure components
diff --git a/Control/CalypsoExample/GeoModelTest/python/Faser03TestConfig.py b/Control/CalypsoExample/GeoModelTest/python/Faser03TestConfig.py
index 23540a82d4506172174dbe8afa20d8353e83e499..28af4bc926c60ee712ceaea7cad9ad12985a9dae 100644
--- a/Control/CalypsoExample/GeoModelTest/python/Faser03TestConfig.py
+++ b/Control/CalypsoExample/GeoModelTest/python/Faser03TestConfig.py
@@ -47,6 +47,7 @@ if __name__ == "__main__":
# configFlags.Detector.EnableCentralDipole = True
# configFlags.Detector.EnableDownstreamDipole = True
# configFlags.Detector.EnableEcal = True
+ configFlags.Input.Files = [] # Dummy input
configFlags.lock()
# Configure components
diff --git a/Control/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py b/Control/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py
index afc970b0e9eeb7d38541a8055f9fa180ad382879..0ecdc0289f8eeb8240d9e65e1862268382f74cd7 100644
--- a/Control/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py
+++ b/Control/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py
@@ -54,6 +54,7 @@ if __name__ == "__main__":
# configFlags.Detector.EnableCentralDipole = True
# configFlags.Detector.EnableDownstreamDipole = True
# configFlags.Detector.EnableEcal = True
+ configFlags.Input.Files = [] # Dummy input
configFlags.lock()
# Configure components
diff --git a/Control/CalypsoExample/GeoModelTest/python/TestBeam00TestConfig.py b/Control/CalypsoExample/GeoModelTest/python/TestBeam00TestConfig.py
index 406df28772926c7fa04dc5f21dbdbc332aec8a68..96d6e5c03d008cb77a2163cff1d281a4969e6781 100644
--- a/Control/CalypsoExample/GeoModelTest/python/TestBeam00TestConfig.py
+++ b/Control/CalypsoExample/GeoModelTest/python/TestBeam00TestConfig.py
@@ -53,6 +53,7 @@ if __name__ == "__main__":
# configFlags.Detector.EnableCentralDipole = True
# configFlags.Detector.EnableDownstreamDipole = True
# configFlags.Detector.EnableEcal = True
+ configFlags.Input.Files = [] # Dummy input
configFlags.lock()
# Configure components
diff --git a/Control/CalypsoExample/GeoModelTest/python/TestBeam01TestConfig.py b/Control/CalypsoExample/GeoModelTest/python/TestBeam01TestConfig.py
index 1a23da76f06aa33852e1388df874d0e0ac094274..c0485aeda8662afcbfc414d18f9c92e13c7bac28 100644
--- a/Control/CalypsoExample/GeoModelTest/python/TestBeam01TestConfig.py
+++ b/Control/CalypsoExample/GeoModelTest/python/TestBeam01TestConfig.py
@@ -53,6 +53,7 @@ if __name__ == "__main__":
# configFlags.Detector.EnableCentralDipole = True
# configFlags.Detector.EnableDownstreamDipole = True
# configFlags.Detector.EnableEcal = True
+ configFlags.Input.Files = [] # Dummy input
configFlags.lock()
# Configure components