Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions .ci/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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()
Expand Down
Loading