Merge branch 'salderwe/ATR-19174/20191010' into 'master'

Adding and removing TrigP1Tests

See merge request atlas/athena!27148

Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_ROSRate_build.py → Trigger/TrigValidation/TrigP1Test/test/test_trigP1_FullMenu_ROSRate_build.py

 #!/usr/bin/env python
 
-# art-description: A version of the CalibPeb test including ROS rate simulation
+# art-description: Same as full_menu test from TrigUpgradeTest, but with athenaHLT, and adding ROS simulation
 # art-type: build
 # art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
 
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps, Step
 
 ex = ExecStep.ExecStep()
 ex.type = 'athenaHLT'
-ex.job_options = 'TrigExPartialEB/MTCalibPeb.py'
+ex.job_options = 'TrigUpgradeTest/full_menu.py'
 ex.input = 'data'
-ex.args = '--ros2rob /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ATLASros2rob2018-r22format.py'
+ex.args = '-c "doWriteESD=False" --ros2rob /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ATLASros2rob2018-r22format.py'
 ex.perfmon = False # perfmon with athenaHLT doesn't work at the moment
 
 ros2json = CheckSteps.InputDependentStep("RosRateToJson")

Trigger/TrigValidation/TrigP1Test/test/test_trigP1_MuonSlice_build.py → Trigger/TrigValidation/TrigP1Test/test/test_trigP1_FullMenu_fork_build.py

 #!/usr/bin/env python
 
-# art-description: Same as slice_mu test from TrigUpgradeTest, but with athenaHLT
-# art-type: build                                                                  
-# art-include: master/Athena                                                       
+# art-description: Same as full_menu test from TrigUpgradeTest, but with athenaHLT, MP
+# art-type: build
+# art-include: master/Athena
 
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 
@@ -10,7 +10,10 @@ ex = ExecStep.ExecStep()
 ex.type = 'athenaHLT'
 ex.job_options = 'TrigUpgradeTest/full_menu.py'
 ex.input = 'data'
-ex.args = '-c "doEmptyMenu=True;doMuonSlice=True;doWriteESD=False"'
+ex.forks = 8
+ex.threads = 1
+ex.concurrent_events = 1
+ex.args = '-c "doWriteESD=False"'
 ex.perfmon = False # perfmon with athenaHLT doesn't work at the moment
 
 test = Test.Test()

Trigger/TrigValidation/TrigP1Test/test/test_trigP1_JetSlice_forkAndMT_build.py

+#!/usr/bin/env python
+
+# art-description: Same as slice_jet test from TrigUpgradeTest, but with athenaHLT, MP & MT
+# art-type: build
+# art-include: master/Athena
+
+from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
+
+ex = ExecStep.ExecStep()
+ex.type = 'athenaHLT'
+ex.job_options = 'TrigUpgradeTest/full_menu.py'
+ex.input = 'data'
+ex.forks = 2
+ex.threads = 2
+ex.concurrent_events = 2
+ex.args = '--stdcmalloc -c "doEmptyMenu=True;doJetSlice=True;doWriteESD=False"'
+ex.perfmon = False # perfmon with athenaHLT doesn't work at the moment
+
+test = Test.Test()
+test.art_type = 'build'
+test.exec_steps = [ex]
+test.check_steps = CheckSteps.default_check_steps(test)
+
+import sys
+sys.exit(test.run())