From eaaeee88dc8412e3c224dd6a58288512800b0e04 Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Wed, 3 Jul 2019 13:52:50 +0000
Subject: [PATCH] Trigger ART tests: clean up art-output and art-include

---
 .../test/test_mc_ntup_physval_grid.sh         | 12 +++++++---
 .../test_mc_pp_v7_trigdecisiontool_grid.sh    | 19 ++++++++--------
 .../test/test_mc_pp_v7_trigedm_grid.sh        | 19 ++++++++--------
 .../test/test_mc_rdo_to_rdoftk_grid.sh        | 16 +++++++++-----
 ...sics_pp_v7_primaries_ftk_rdotoaod_build.sh | 19 +++-------------
 ...ysics_pp_v7_primaries_ftk_rdotoaod_grid.sh | 21 ++++++++----------
 ...s_pp_v7_primaries_ftk_rdotoesdaod_build.sh | 15 ++-----------
 ...cs_pp_v7_primaries_ftk_rdotoesdaod_grid.sh | 22 ++++++++-----------
 ..._physics_pp_v7_primaries_rdotoaod_build.sh | 17 ++------------
 ...t_physics_pp_v7_primaries_rdotoaod_grid.sh | 21 ++++++++----------
 ...sics_pp_v7_primaries_rdotoaodslim_build.sh | 15 ++-----------
 ...sics_pp_v7_primaries_rdotobstoesd_build.sh | 15 ++-----------
 ...ysics_pp_v7_primaries_rdotoesdaod_build.sh | 15 ++-----------
 ...hysics_pp_v7_primaries_rdotoesdaod_grid.sh | 22 ++++++++-----------
 .../test/test_run1_bstoesdaod_build.sh        | 20 +++--------------
 .../test_trigAna_HITtoAOD_trigRel21_build.sh  |  8 ++-----
 .../test/test_trigAna_HITtoRDOTrig_build.sh   |  8 ++-----
 .../test_trigAna_HITtoRDOTrig_mt1_build.sh    |  8 ++-----
 .../test/test_trigAna_q221_RDOtoAOD_build.sh  |  8 ++-----
 .../test_trigAna_q221_RDOtoAOD_mt1_build.sh   |  8 ++-----
 .../test_trigAna_q221_RDOtoPhysval_build.sh   |  8 ++-----
 ...est_trigAna_q221_RDOtoPhysval_mt1_build.sh |  8 ++-----
 .../test_trigAna_q221_RDOtoRDOTrig_build.sh   |  8 ++-----
 ...est_trigAna_q221_RDOtoRDOTrig_mt1_build.sh |  8 ++-----
 .../test/test_trigP1_timeout_build.sh         |  5 -----
 .../test_trigUpgr_bjet_menu_ALLTE_build.sh    |  6 ++---
 .../test/test_trigUpgr_calo_cf_build.sh       |  6 ++---
 .../test/test_trigUpgr_calo_only_build.sh     |  6 ++---
 .../test_trigUpgr_calo_ringer_only_build.sh   |  6 ++---
 .../test/test_trigUpgr_dataScouting_build.sh  |  6 ++---
 .../test/test_trigUpgr_decodeBS_build.sh      |  6 ++---
 .../test/test_trigUpgr_egamma_cf_build.sh     |  6 ++---
 .../test_trigUpgr_egamma_ringer_cf_build.sh   |  6 ++---
 .../test/test_trigUpgr_empty_menu_build.sh    |  6 ++---
 .../test/test_trigUpgr_empty_menu_mc_build.sh |  6 ++---
 .../test/test_trigUpgr_emu_newjo_build.sh     |  6 ++---
 .../test/test_trigUpgr_full_menu_build.sh     |  6 ++---
 .../test/test_trigUpgr_full_menu_cf_build.sh  |  6 ++---
 .../test/test_trigUpgr_full_menu_grid.sh      |  6 ++++-
 .../test/test_trigUpgr_full_menu_mc_build.sh  |  6 ++---
 .../test/test_trigUpgr_full_menu_mc_grid.sh   |  6 ++++-
 .../test/test_trigUpgr_id_calo_cf_build.sh    |  6 ++---
 .../test/test_trigUpgr_id_cf_build.sh         |  6 ++---
 .../test/test_trigUpgr_id_cf_mc_build.sh      |  6 ++---
 .../test/test_trigUpgr_jet_build.sh           |  6 ++---
 .../test/test_trigUpgr_met_fromCells_build.sh |  6 ++---
 ...st_trigUpgr_met_fromClustersPufit_build.sh |  6 ++---
 .../test_trigUpgr_met_fromClusters_build.sh   |  6 ++---
 .../test/test_trigUpgr_met_fromJets_build.sh  |  6 ++---
 .../test/test_trigUpgr_minbias_build.sh       |  6 ++---
 .../test/test_trigUpgr_mu_cf_build.sh         |  6 ++---
 .../test/test_trigUpgr_newJO_build.sh         |  5 ++---
 .../test/test_trigUpgr_peb_build.sh           |  6 ++---
 .../test/test_trigUpgr_runMenuTest_build.sh   |  6 ++---
 .../test/test_trigUpgr_slice_bjet_build.sh    |  6 ++---
 .../test_trigUpgr_slice_bphysics_build.sh     |  6 ++---
 .../test_trigUpgr_slice_electron_build.sh     |  6 ++---
 .../test/test_trigUpgr_slice_jet_build.sh     |  6 ++---
 .../test/test_trigUpgr_slice_met_build.sh     |  6 ++---
 .../test/test_trigUpgr_slice_mu_build.sh      |  6 ++---
 .../test/test_trigUpgr_slice_mu_mc_build.sh   |  6 ++---
 .../test/test_trigUpgr_slice_mu_mc_grid.sh    |  6 ++++-
 .../test/test_trigUpgr_slice_photon_build.sh  |  6 ++---
 .../test/test_trigUpgr_slice_tau_build.sh     |  6 ++---
 ...test_data_physics_pp_v7_primaries_build.sh | 15 ++-----------
 .../test_data_physics_pp_v7_primaries_grid.sh | 19 ++++++++--------
 .../TriggerTest/test/test_mc_hi_v4_grid.sh    | 21 +++++++++---------
 .../TriggerTest/test/test_mc_hi_v5_grid.sh    | 21 +++++++++---------
 .../test/test_physics_hi_v4_build.sh          | 17 +++-----------
 .../test/test_physics_hi_v4_grid.sh           | 21 +++++++++---------
 .../test/test_physics_hi_v5_build.sh          | 17 +++-----------
 .../test/test_physics_hi_v5_grid.sh           | 21 +++++++++---------
 .../test_physics_pp_v7_primaries_aod_grid.sh  | 21 +++++++++---------
 .../test_physics_pp_v7_primaries_build.sh     | 15 ++-----------
 .../test_physics_pp_v7_primaries_ftk_build.sh | 16 ++------------
 .../test_physics_pp_v7_primaries_ftk_grid.sh  | 20 ++++++++---------
 .../test/test_physics_pp_v7_primaries_grid.sh | 19 ++++++++--------
 .../TriggerTest/test/test_slice_bjet_build.sh | 17 +++-----------
 .../TriggerTest/test/test_slice_bjet_grid.sh  | 21 +++++++++---------
 .../test/test_slice_bphysics_build.sh         | 17 +++-----------
 .../test/test_slice_bphysics_grid.sh          | 21 +++++++++---------
 .../test/test_slice_bphysicsexo_aod_grid.sh   | 21 +++++++++---------
 .../test/test_slice_electron_build.sh         | 17 +++-----------
 .../test/test_slice_electron_grid.sh          | 21 +++++++++---------
 .../TriggerTest/test/test_slice_id_build.sh   | 17 +++-----------
 .../TriggerTest/test/test_slice_jet_build.sh  | 17 +++-----------
 .../TriggerTest/test/test_slice_jet_grid.sh   | 21 +++++++++---------
 .../TriggerTest/test/test_slice_l1_build.sh   | 17 +++-----------
 .../TriggerTest/test/test_slice_l1_grid.sh    | 21 +++++++++---------
 .../TriggerTest/test/test_slice_met_build.sh  | 17 +++-----------
 .../TriggerTest/test/test_slice_met_grid.sh   | 21 +++++++++---------
 .../test/test_slice_minbias_build.sh          | 17 +++-----------
 .../test/test_slice_minbias_grid.sh           | 21 +++++++++---------
 .../test/test_slice_minbias_hmt_build.sh      | 17 +++-----------
 .../test/test_slice_minbias_hmt_grid.sh       | 21 +++++++++---------
 .../TriggerTest/test/test_slice_muon_build.sh | 17 +++-----------
 .../TriggerTest/test/test_slice_muon_grid.sh  | 21 +++++++++---------
 .../TriggerTest/test/test_slice_tau_build.sh  | 17 +++-----------
 .../TriggerTest/test/test_slice_tau_grid.sh   | 21 +++++++++---------
 99 files changed, 426 insertions(+), 813 deletions(-)

diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_ntup_physval_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_ntup_physval_grid.sh
index e79a7e62816..4103305145c 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_ntup_physval_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_ntup_physval_grid.sh
@@ -2,15 +2,21 @@
 
 # art-description: Test of Trigger NTUP_PHYSVAL 
 # art-type: grid
-# art-include: 21.3/Athena
 # art-include: 21.0/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: *check*
+# art-output: *.txt
 # art-output: *.log
 # art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
 # art-output: *.pmon.gz
-# art-output: TotalEventsProcessed.txt
+# art-output: *perfmon*
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 # art-output: PHYSVAL_WEB
 
 export NAME="mc_ntup_physval_grid"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh
index a1d746fc9c3..1a7ae0a73ea 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh
@@ -6,19 +6,18 @@
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="mc_pp_v7_trigdecisiontool_grid"
 export JOB_LOG="athena.log"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh
index 18b7e54ce7f..939165736d6 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh
@@ -6,19 +6,18 @@
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="mc_pp_v7_trigedm_grid"
 export JOB_LOG="athena.log"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_rdo_to_rdoftk_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_rdo_to_rdoftk_grid.sh
index 8fb3eaf6679..ec52f33c2c8 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_rdo_to_rdoftk_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_rdo_to_rdoftk_grid.sh
@@ -2,17 +2,21 @@
 
 # art-description: Test of Trigger FTK RDO->RDO_FTK 
 # art-type: grid
-# art-include: 21.3/Athena
 # art-include: 21.0/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: *check*
+# art-output: *.txt
 # art-output: *.log
-# art-output: log.RAW*
-# art-output: log.RDO*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
 # art-output: *.pmon.gz
-# art-output: TotalEventsProcessed.txt
-
+# art-output: *perfmon*
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="mc_rdo_to_rdoftk_grid"
 export JOB_LOG="athena.log"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_build.sh
index 9c766012018..4bcc091474d 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_build.sh
@@ -1,23 +1,10 @@
 #!/bin/bash
 
-# art-description: Trigger v7 primaries RDO to AOD test FTK
+# art-description: Trigger v7 primaries RDO to AOD test with FTK
 # art-type: build
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_ftk_rdotoaod_build"
 export INPUT="ftk"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_grid.sh
index e1d16809aad..4f927081dd2 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoaod_grid.sh
@@ -3,21 +3,18 @@
 # art-description: Trigger v7 primaries RDO to AOD test with FTK
 # art-type: grid
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
-# art-output: *.regtest.new
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_pp_v7_primaries_ftk_rdotoaod_grid"
 export INPUT="ftk"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_build.sh
index 227d06c03eb..455d02cc620 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_build.sh
@@ -3,19 +3,8 @@
 # art-description: Trigger v7 primaries RDO to ESD and AOD test, plus extra tests using these files. With FTK
 # art-type: build
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_ftk_rdotoesdaod_build"
 export INPUT="ftk"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_grid.sh
index c938457e844..4f0b3eefe73 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_ftk_rdotoesdaod_grid.sh
@@ -3,22 +3,18 @@
 # art-description: Trigger v7 primaries RDO to ESD and AOD test, plus extra tests using these files. With FTK
 # art-type: grid
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
-# art-output: *.regtest.new
-
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_pp_v7_primaries_ftk_rdotoesdaod_grid"
 export INPUT="ftk"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_build.sh
index ea1b9566ded..c8bc217f87f 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_build.sh
@@ -3,21 +3,8 @@
 # art-description: Trigger v7 primaries RDO to AOD test
 # art-type: build
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_rdotoaod_build"
 export COST_MONITORING="False"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_grid.sh
index b9264d1cec8..86ac838a427 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaod_grid.sh
@@ -3,21 +3,18 @@
 # art-description: Trigger v7 primaries RDO to AOD test
 # art-type: grid
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
-# art-output: *.regtest.new
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_pp_v7_primaries_rdotoaod_grid"
 export COST_MONITORING="False"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaodslim_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaodslim_build.sh
index 8c72593f377..0ef56c97694 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaodslim_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoaodslim_build.sh
@@ -3,19 +3,8 @@
 # art-description: Trigger v7 primaries RDO to AODSLIM
 # art-type: build
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_rdotoaodslim_build"
 export COST_MONITORING="False"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotobstoesd_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotobstoesd_build.sh
index 01b009bf9fb..4a212662ee6 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotobstoesd_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotobstoesd_build.sh
@@ -3,19 +3,8 @@
 # art-description: Trigger v7 primaries RDO to BS and BS to ESD test
 # art-type: build
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_rdotobstoesd_build"
 export COST_MONITORING="False"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_build.sh
index 5319932951a..32596756e98 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_build.sh
@@ -3,19 +3,8 @@
 # art-description: Trigger v7 primaries RDO to ESD and AOD test, plus extra tests using these files
 # art-type: build
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_rdotoesdaod_build"
 export COST_MONITORING="False"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_grid.sh
index 092df0cf318..65f3b52d6a3 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_primaries_rdotoesdaod_grid.sh
@@ -3,22 +3,18 @@
 # art-description: Trigger v7 primaries RDO to ESD and AOD test, plus extra tests using these files
 # art-type: grid
 # art-include: master/Athena
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
-# art-output: *.regtest.new
-
+# art-output: *.check*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_pp_v7_primaries_rdotoesdaod_grid"
 export COST_MONITORING="False"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_run1_bstoesdaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_run1_bstoesdaod_build.sh
index b41ce19b829..6ea0604578e 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_run1_bstoesdaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_run1_bstoesdaod_build.sh
@@ -2,26 +2,12 @@
 
 # art-description: Trigger test on Run 1 Bytestream data
 # art-type: build
+# art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
-# art-include: 21.0-TrigMC/Athena
 # art-include: master/Athena
-# art-include: 21.1/AthenaP1
-# art-include: 21.1-dev/AthenaP1
-# art-output: *check*
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: AOD.pool.root.checkFile0
-# art-output: AOD.pool.root.checkFiletrigSize.txt
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="run1_bstoesdaod_build"
 export COST_MONITORING="False"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoAOD_trigRel21_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoAOD_trigRel21_build.sh
index c83460e7d75..e0111850fee 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoAOD_trigRel21_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoAOD_trigRel21_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test running HITS->RDO in master, then RDO->RDO_TRIG in 21.0, then RDO_TRIG->AOD in master
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_HITtoAOD_trigRel21_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_build.sh
index 496e8065571..51a78d9f792 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of transform HITS->RDO->RDO_TRIG with serial athena
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_HITtoRDOTrig_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_mt1_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_mt1_build.sh
index 89e6708f790..3dc102ecdb5 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_mt1_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_mt1_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of transform HITS->RDO with serial athena followed by RDO->RDO_TRIG with threads=1
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_HITtoRDOTrig_mt1_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_build.sh
index 98a02eca505..8bd322a6b4d 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of transform RDO->RDO_TRIG->ESD->AOD with serial athena (legacy trigger)
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_q221_RDOtoAOD_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_mt1_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_mt1_build.sh
index 420e13b9510..a2196baaaf7 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_mt1_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoAOD_mt1_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of transform RDO->RDO_TRIG->ESD->AOD with threads=1
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_q221_RDOtoAOD_mt1_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_build.sh
index 3bd8f47bc87..e261888d6f4 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of transform RDO->RDO_TRIG->ESD->AOD->NTUP_PHYSVAL with serial athena (legacy trigger)
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_q221_RDOtoPhysval_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_build.sh
index b0c80c88776..de67fa4c987 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of transform RDO->RDO_TRIG->ESD->AOD with threads=1 followed by AOD->NTUP_PHYSVAL with serial athena
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_q221_RDOtoPhysval_mt1_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_build.sh
index f85929c4298..0fc6837c416 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of the RDOtoRDOTrigger transform with serial athena (legacy trigger)
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_q221_RDOtoRDOTrig_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_mt1_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_mt1_build.sh
index 9af1931f8f7..0b0991f24ca 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_mt1_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_mt1_build.sh
@@ -3,12 +3,8 @@
 # art-description: Test of the RDOtoRDOTrigger transform with threads=1
 # art-type: build
 # art-include: master/Athena
-# art-output: log.*
-# art-output: *.log
-# art-output: *.txt
-# art-output: *.root
-# art-output: runargs.*
-# art-output: runwrapper.*
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="trigAna_q221_RDOtoRDOTrig_mt1_build"
 export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_timeout_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_timeout_build.sh
index 424b281abe7..9491ac338e3 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_timeout_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_timeout_build.sh
@@ -2,11 +2,6 @@
 # art-description: athenaHLT test of timeout handling
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.out
-# art-output: *.err
-# art-output: *.data
-# art-output: *.root
 
 outputBaseName="output.test_trigP1_timeout.data"
 nEvents=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_bjet_menu_ALLTE_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_bjet_menu_ALLTE_build.sh
index d3cc98b4165..c13260f11ef 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_bjet_menu_ALLTE_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_bjet_menu_ALLTE_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test with bjet ALLTE chains
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=100
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_cf_build.sh
index 4a9cba4067b..fb4a353dbd6 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_cf_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using IDCalo job options with doID=False
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh
index 82fd556c0b1..cb930f12c07 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test with only calo algorithms
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh
index 18bc6f649d7..ee603bf8b67 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test running only ringer
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_dataScouting_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_dataScouting_build.sh
index 92a7a1ebc9b..d84b675ded4 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_dataScouting_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_dataScouting_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of the data scouting (TLA) infrastructure
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_decodeBS_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_decodeBS_build.sh
index 43f2f053a9d..c881742f7d2 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_decodeBS_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_decodeBS_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of BS decoding
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 # Common settings for all steps
 export EVENTS=5
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_cf_build.sh
index 4e0bce96931..c3d82c83bba 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_cf_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the egamma.withViews.py job options
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_ringer_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_ringer_cf_build.sh
index efead6c2737..d79ede93eeb 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_ringer_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_ringer_cf_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of egamma sequence with ringer
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_build.sh
index 73fe9859e38..cb27d3bda66 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test on data running no HLT menu
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=10
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_mc_build.sh
index fcd8282d67f..4cb77564b14 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_mc_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_mc_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test on MC running L1 simulation and no HLT menu
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=10
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_emu_newjo_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_emu_newjo_build.sh
index 0e978281322..00fa7884e5b 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_emu_newjo_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_emu_newjo_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test running the new-style job options EmuNewJOTest.py
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export JOBOPTION="EmuNewJOTest.pkl"
 export FROMPICKLE=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_build.sh
index 3807d1fbea3..d9a4904d827 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the full LS2_v1 menu from TriggerMenuMT
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
index b24376d59a8..8ed9a66e057 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the full menu from TrigUpgradeTest job options
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_grid.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_grid.sh
index 27db044be82..426352bbfe3 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_grid.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_grid.sh
@@ -2,10 +2,14 @@
 # art-description: athenaMT trigger test using the full LS2_v1 menu from TriggerMenuMT
 # art-type: grid
 # art-include: master/Athena
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
 # art-output: *.new
-# art-output: *.txt
+# art-output: *.json
 # art-output: *.root
+# art-output: *.pmon.gz
+# art-output: *perfmon*
 
 export INPUT="run2dataFTK" # FTK doesn't matter here - using this dataset because of larger stats
 export EVENTS=1000
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_build.sh
index a2ff44a977b..2e2e25c5754 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the full LS2_v1 menu from TriggerMenuMT
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=20
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_grid.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_grid.sh
index 7d04e9d5276..51d0f225de8 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_grid.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_grid.sh
@@ -2,10 +2,14 @@
 # art-description: athenaMT trigger test using the full LS2_v1 menu from TriggerMenuMT
 # art-type: grid
 # art-include: master/Athena
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
 # art-output: *.new
-# art-output: *.txt
+# art-output: *.json
 # art-output: *.root
+# art-output: *.pmon.gz
+# art-output: *perfmon*
 
 export INPUT="ttbar"
 export EVENTS=1000
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh
index 037ce23424d..69aed3f7b60 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using IDCalo job options
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh
index cf284274b14..6cbd40ed4ed 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using IDCalo job options with doCalo=False
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh
index 2d5c8531e96..33d5897f17b 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test on MC using IDCalo job options with doCalo=False
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_jet_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_jet_build.sh
index 75f56506ea8..32d60bbe5a4 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_jet_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_jet_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using simpleJetJob job options
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=5
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromCells_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromCells_build.sh
index 9dd067f5277..5f4564806bf 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromCells_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromCells_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of MET from cells algorithm
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=10
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClustersPufit_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClustersPufit_build.sh
index a9c279c1f87..8ec8325050a 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClustersPufit_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClustersPufit_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of MET pufit algorithm
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=10
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClusters_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClusters_build.sh
index 1e453500537..9c83c39d983 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClusters_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromClusters_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of MET from clusters algorithm
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=10
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromJets_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromJets_build.sh
index 207cc642e81..1ede6f0d09a 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromJets_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_met_fromJets_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of MET from jets algorithm
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=10
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_minbias_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_minbias_build.sh
index 8ee2c47ae53..40f17fa04f6 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_minbias_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_minbias_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test for min bias reconstruction algorithms.
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh
index 14727688f7c..9636fbfd97a 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using mu.withViews.py job options
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=50
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_newJO_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_newJO_build.sh
index a670f1aecd0..d66266c0a0d 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_newJO_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_newJO_build.sh
@@ -2,9 +2,8 @@
 # art-description: athenaMT trigger test running the new-style job options from TrigUpgradeTest
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.root
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=30
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_peb_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_peb_build.sh
index 372d0f08948..a3f89bc624e 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_peb_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_peb_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test of the data scouting (TLA) infrastructure
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_runMenuTest_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_runMenuTest_build.sh
index c8220624794..96565e45ce7 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_runMenuTest_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_runMenuTest_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using runMenuTest.py job options
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bjet_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bjet_build.sh
index 78192086710..349f5d6f376 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bjet_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bjet_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the LS2_v1 bjet menu from TriggerMenuMT 
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=100
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bphysics_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bphysics_build.sh
index 4c3405d0c89..422ebeaab19 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bphysics_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bphysics_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the muon menu from TrigUpgradeTest job options
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=50
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_electron_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_electron_build.sh
index 641a46a1b7f..0297ba173f2 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_electron_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_electron_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the LS2_v1 electron menu from TriggerMenuMT 
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_jet_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_jet_build.sh
index 4edba881c82..d92f42dd00e 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_jet_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_jet_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the LS2_v1 jet menu from TriggerMenuMT 
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_build.sh
index 6b98223ce9f..2f2630c2459 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the LS2_v1 MET menu from TriggerMenuMT 
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=50
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_build.sh
index 73b4099650d..319ebf59541 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the LS2_v1 muon menu from TriggerMenuMT
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=50
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_build.sh
index 32adfe00707..bf1e5bfd947 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test on MC running L1 simulation and the LS2_v1 muon menu from TriggerMenuMT
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export EVENTS=10
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_grid.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_grid.sh
index 1654d6cb7d5..2f0d62f203c 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_grid.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_grid.sh
@@ -2,10 +2,14 @@
 # art-description: athenaMT trigger test on MC running L1 simulation and the LS2_v1 muon menu from TriggerMenuMT
 # art-type: grid
 # art-include: master/Athena
+# art-output: *.txt
 # art-output: *.log
+# art-output: log.*
 # art-output: *.new
-# art-output: *.txt
+# art-output: *.json
 # art-output: *.root
+# art-output: *.pmon.gz
+# art-output: *perfmon*
 
 export EVENTS=1000
 export THREADS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_photon_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_photon_build.sh
index 89761cf9a63..67d7ea008f1 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_photon_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_photon_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the LS2_v1 photon menu from TriggerMenuMT
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=0
 export EVENTS=10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_tau_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_tau_build.sh
index 5b3382c01c4..02f9fc85d0a 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_tau_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_tau_build.sh
@@ -2,10 +2,8 @@
 # art-description: athenaMT trigger test using the LS2_v1 tau menu from TriggerMenuMT
 # art-type: build
 # art-include: master/Athena
-# art-output: *.log
-# art-output: *.new
-# art-output: *.txt
-# art-output: *.root
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export SKIPEVENTS=10
 export EVENTS=20
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_build.sh
index 43a76526a9e..d420e10e75a 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_build.sh
@@ -5,19 +5,8 @@
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig_*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="data_physics_pp_v7_primaries_build"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_grid.sh
index feca68d4294..b78b1c4207f 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_grid.sh
@@ -5,19 +5,18 @@
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig_*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="data_physics_pp_v7_primaries_grid"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v4_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v4_grid.sh
index 312302ae490..7700e25e7cd 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v4_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v4_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="mc_hi_v4_grid"
 export MENU="MC_HI_v4"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v5_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v5_grid.sh
index c80c8a9a3e9..fa208188b62 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v5_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_mc_hi_v5_grid.sh
@@ -4,20 +4,19 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-include: 21.3/Athena
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="mc_hi_v5_grid"
 export MENU="MC_HI_v5"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_build.sh
index dc95c864e3a..f6fa20aeae7 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_hi_v4_build"
 export MENU="Physics_HI_v4"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_grid.sh
index ef4b3d08d59..ca9605ecabb 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v4_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_hi_v4_grid"
 export MENU="Physics_HI_v4"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_build.sh
index 153c148ec50..705ea3b29bd 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_build.sh
@@ -4,20 +4,9 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-include: 21.3/Athena
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_hi_v5_build"
 export MENU="Physics_HI_v5"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_grid.sh
index a05c7674942..6013c26db84 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_hi_v5_grid.sh
@@ -4,20 +4,19 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-include: 21.3/Athena
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_hi_v5_grid"
 export MENU="Physics_HI_v5"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_aod_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_aod_grid.sh
index 32edfc36bca..f9df8ae9427 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_aod_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_aod_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_pp_v7_primaries_aod_grid"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_build.sh
index e683fc63d54..4174b643edf 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_build.sh
@@ -6,19 +6,8 @@
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig_*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_build"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_build.sh
index 54b02ab4a90..e1ec9cc5c60 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_build.sh
@@ -5,21 +5,9 @@
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
-# art-include: 21.0-TrigMC/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="physics_pp_v7_primaries_ftk_build"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_grid.sh
index 861f7ddad48..b9905dd46a6 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_ftk_grid.sh
@@ -5,21 +5,19 @@
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
-# art-include: 21.0-TrigMC/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_pp_v7_primaries_ftk_grid"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_grid.sh
index c8194d0305c..21a89b17507 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_physics_pp_v7_primaries_grid.sh
@@ -6,19 +6,18 @@
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="physics_pp_v7_primaries_grid"
 export MENU="Physics_pp_v7_primaries"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_build.sh
index 604cebd95f1..83441865ac1 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_bjet_build"
 export SLICE="bjet"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_grid.sh
index f4d850b8161..cd4f1a70d61 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bjet_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_bjet_grid"
 export SLICE="bjet"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_build.sh
index dcb64a930a6..5069c8136c6 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_bphysics_build"
 export SLICE="bphysics"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_grid.sh
index f142fd56ee9..4ef1efeeb58 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysics_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_bphysics_grid"
 export SLICE="bphysics"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysicsexo_aod_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysicsexo_aod_grid.sh
index 91b6df915fb..af7bf3812b6 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysicsexo_aod_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_bphysicsexo_aod_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_bphysicsexo_aod_grid"
 export SLICE="mubphysics"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_build.sh
index 821e2812e97..8a05540eb5d 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_electron_build"
 export SLICE="egamma"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_grid.sh
index c087f0d02c6..c24f5e349ec 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_electron_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_electron_grid"
 export SLICE="egamma"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_id_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_id_build.sh
index 2c719a9a537..319463c3ded 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_id_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_id_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_id_build"
 export EVENTS="10"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_build.sh
index d1e504164e7..f102a8379b8 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_jet_build"
 export SLICE="jet"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_grid.sh
index 3f965219251..ef442290531 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_jet_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_jet_grid"
 export SLICE="jet"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_build.sh
index e214de73274..547a5b70468 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_l1_build"
 export EVENTS="10"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_grid.sh
index 1e0988945ab..c217a006d3d 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_l1_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_l1_grid"
 export JOBOPTIONS="TriggerTest/testLVL1CTPAthenaTrigRDO.py"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_met_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_met_build.sh
index 916c6b06d5f..e870974e659 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_met_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_met_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_met_build"
 export SLICE="met"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_met_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_met_grid.sh
index 74d31245b2b..0bf0f94505a 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_met_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_met_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_met_grid"
 export SLICE="met"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_build.sh
index 20049a38825..3f3eaeab902 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_minbias_build"
 export SLICE="minbias"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_grid.sh
index 39915d32a71..6144d572e0c 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_minbias_grid"
 export SLICE="minbias"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_build.sh
index 2c0327707e5..691fb5a336b 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_minbias_hmt_build"
 export SLICE="minbiasEnhanced"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_grid.sh
index 4fb004319d4..a011d2f1ec9 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_minbias_hmt_grid"
 export SLICE="minbiasEnhanced"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_build.sh
index c2f65a8eb2d..b72738366e6 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_muon_build"
 export SLICE="muon"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_grid.sh
index 90f577ed1f6..b82a101104f 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_muon_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_muon_grid"
 export SLICE="muon"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_build.sh
index a978e7abef5..3fc39d59f9b 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_build.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_build.sh
@@ -4,21 +4,10 @@
 # art-type: build
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
-# art-output: *.log
-# art-output: costMonitoring_*
-# art-output: *.root
-# art-output: ntuple.pmon.gz
-# art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
 
 export NAME="slice_tau_build"
 export SLICE="tau"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_grid.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_grid.sh
index 01ae58d8ab5..3f02e8942d8 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_grid.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_tau_grid.sh
@@ -4,21 +4,20 @@
 # art-type: grid
 # art-include: 21.1/AthenaP1
 # art-include: 21.0/Athena
-# art-include: 21.0-TrigMC/Athena
+# art-include: 21.3/Athena
 # art-include: master/Athena
-# art-output: HLTChain.txt
-# art-output: HLTTE.txt
-# art-output: L1AV.txt
-# art-output: HLTconfig*.xml
-# art-output: L1Topoconfig*.xml
-# art-output: LVL1config*.xml
+# art-output: *.txt
 # art-output: *.log
-# art-output: costMonitoring_*
+# art-output: log.*
+# art-output: *.new
+# art-output: *.json
 # art-output: *.root
-# art-output: ntuple.pmon.gz
+# art-output: *.pmon.gz
 # art-output: *perfmon*
-# art-output: TotalEventsProcessed.txt
-# art-output: *.regtest.new
+# art-output: costMonitoring_*
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
 
 export NAME="slice_tau_grid"
 export SLICE="tau"
-- 
GitLab