From ebfe71028e5267444dc3245bda8c4f96f4cd4733 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier <frank.winklmeier@cern.ch> Date: Tue, 14 May 2024 10:54:41 +0200 Subject: [PATCH] PyJobTransforms: use default asetup in sub-steps running in different release When running a sub-step (e.g. RDOtoRDOTrigger) in a different release, use the `asetup` alias (defined by `setupATLAS`) to setup the release instead of the `$AtlasSetup` from the user environment. The latter may point to the beta version on afs that is not accessible from within the container. --- Tools/PyJobTransforms/python/trfExe.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Tools/PyJobTransforms/python/trfExe.py b/Tools/PyJobTransforms/python/trfExe.py index a46017379e27..efc16b686d0b 100755 --- a/Tools/PyJobTransforms/python/trfExe.py +++ b/Tools/PyJobTransforms/python/trfExe.py @@ -1610,13 +1610,7 @@ source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh""" if self._containerSetup is not None: asetupFile = open(self._setupFile, 'w') wfile = asetupFile - print("# asetup", file=wfile) - print('echo Sourcing {AtlasSetupDirectory}/scripts/asetup.sh {asetupStatus}'.format( - AtlasSetupDirectory = os.environ['AtlasSetup'], - asetupStatus = asetup - ), file=wfile) - print('source {AtlasSetupDirectory}/scripts/asetup.sh {asetupStatus}'.format( - AtlasSetupDirectory = os.environ['AtlasSetup'], + print('asetup {asetupStatus}'.format( asetupStatus = asetup ), file=wfile) print('if [ ${?} != "0" ]; then exit 255; fi', file=wfile) -- GitLab