From 945b5eae0f16a66c55ec27779dbd3ad2896bcb88 Mon Sep 17 00:00:00 2001 From: Anthony Islas Date: Thu, 16 Jan 2025 15:57:56 -0700 Subject: [PATCH] Fix explicit setting of timelimit Use the explicit modifications of the hpc join step to insert submit options. This works better than defining host-specific options as it allows the usage of any previous submit options already in the suite and not potentially dropping suite host-specific required options. Furthermore, now after the step is fully parsed and set then we can ensure our forced in situ modifications do not get overwritten. --- .ci/runner.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.ci/runner.py b/.ci/runner.py index b20bd9f..99257d8 100755 --- a/.ci/runner.py +++ b/.ci/runner.py @@ -250,15 +250,6 @@ def runHPCJoin( self, tests ) : self.log( "Using current file as launch executable : " + ABS_FILEPATH ) stepDict = { - "submit_options" : - { - self.globalOpts_.forceFQDN : - { - # Make this a host-specific so that it has priority - "submission" : hpcSubmit[0], - "timelimit" : maxTimelimitStr - } - }, "command" : ABS_FILEPATH, "arguments" : args } @@ -282,6 +273,9 @@ def runHPCJoin( self, tests ) : hpcJoinTest.steps_["submit"].submitOptions_.hpcArguments_ = maxResources # No other args hpcJoinTest.steps_["submit"].addTestScriptArgs_ = False + # Force submit type and timelimit - this allows preceding host specifics but overrides just these options + hpcJoinTest.steps_["submit"].submitOptions_.timelimit_ = maxTimelimitStr + hpcJoinTest.steps_["submit"].submitOptions_.submitType_ = sc.SubmissionType( hpcSubmit[0] ) hpcJoinTest.validate() success = hpcJoinTest.run()