Merge branch 'fix-calibpeb-2' into 'master'

TrigP1Test: Use rootcomp --sortLabels in CalibPeb tests

See merge request atlas/athena!35009

Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_build.py

@@ -19,7 +19,9 @@ test.exec_steps = [ex]
 test.check_steps = CheckSteps.default_check_steps(test)
 
 # Make RootComp step required
-test.get_step('RootComp').required = True
+rc = test.get_step('RootComp')
+rc.required = True
+rc.args += ' --sortLabels'
 
 import sys
 sys.exit(test.run())

Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_concurrent_build.py

@@ -23,7 +23,9 @@ test.exec_steps = [ex]
 test.check_steps = CheckSteps.default_check_steps(test)
 
 # Make RootComp step required
-test.get_step('RootComp').required = True
+rc = test.get_step('RootComp')
+rc.required = True
+rc.args += ' --sortLabels'
 
 import sys
 sys.exit(test.run())

Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_concurrent_grid.py

@@ -35,7 +35,9 @@ test.exec_steps = [ex]
 test.check_steps = CheckSteps.default_check_steps(test)
 
 # Make RootComp step required
-test.get_step('RootComp').required = True
+rc = test.get_step('RootComp')
+rc.required = True
+rc.args += ' --sortLabels'
 
 import sys
 sys.exit(test.run())

Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_highForkAndMT_build.py

@@ -22,7 +22,9 @@ test.exec_steps = [ex]
 test.check_steps = CheckSteps.default_check_steps(test)
 
 # Make RootComp step required
-test.get_step('RootComp').required = True
+rc = test.get_step('RootComp')
+rc.required = True
+rc.args += ' --sortLabels'
 
 import sys
 sys.exit(test.run())