Merge branch 'cherry-pick-3fbc1796f9-master' into 'master'

Sweeping !21326 from 21.3 to master.
Fixes for Trigger TrigAnalysisTest BS ART tests

See merge request atlas/athena!21373

Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotobstoesd_build.sh

@@ -28,7 +28,7 @@ export EVENTS="3"
 export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoBS.py"
 
 source exec_athena_art_trigger_validation.sh
-athena.py -c "jp.AthenaCommonFlags.BSRDOInput=['raw.data']" testAthenaTrigBStoESD.py | tee ${JOB_LOG%%.*}2.${JOB_LOG#*.}
+athena.py -c "jp.AthenaCommonFlags.BSRDOInput=['raw.data']" TrigAnalysisTest/testAthenaTrigBStoESD.py | tee ${JOB_LOG%%.*}2.${JOB_LOG#*.}
 echo "art-result: ${PIPESTATUS[0]} ${JOB_LOG%%.*}2"
 
 source exec_art_triggertest_post.sh

Trigger/TrigValidation/TrigAnalysisTest/test/test_run1_bstoesdaod_build.sh

 #!/bin/bash
 
 # art-description: Trigger test on Run 1 Bytestream data
-# art-type: grid
+# art-type: build
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
 # art-include: 21.0-TrigMC/Athena
@@ -50,5 +50,4 @@ else
   echo "art-result: xAODContainers 1"
 fi
 
-source exec_athena_art_trigger_validation.sh
 source exec_art_triggertest_post.sh