Merge branch 'fix_ATR-21713' into 'master'

Continues to move tests from TrigUpgraTest to better suited packages

See merge request atlas/athena!34995

Trigger/TrigAlgorithms/TrigT2CaloCommon/CMakeLists.txt

@@ -38,3 +38,6 @@ endfunction( _add_test )
 
 _add_test( TestService test/test_dataaccess.sh )
 _add_test( TestServiceNewJO test/test_dataaccessNewJO.sh )
+_add_test( caloCf test/test_t2calo_cf_build.sh )
+_add_test( caloOnly  test/test_t2calo_only_build.sh )
+_add_test( caloRinger test/test_t2calo_ringer_only_build.sh )

Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh → Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_only_build.sh

@@ -8,7 +8,7 @@
 export EVENTS=20
 export THREADS=1
 export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/Calo.py"
+export JOBOPTION="TrigT2CaloCommon/Calo.py"
 
 # Skip dumping chain counts because this test doesn't produce the histogram including them
 export SKIP_CHAIN_DUMP=1

Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh → Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_ringer_only_build.sh

@@ -8,7 +8,7 @@
 export EVENTS=20
 export THREADS=1
 export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/CaloRinger.py"
+export JOBOPTION="TrigT2CaloCommon/CaloRinger.py"
 
 # Skip dumping chain counts because this test doesn't produce the histogram including them
 export SKIP_CHAIN_DUMP=1