Merge branch 'trftestsart_20240223' into '24.0'

TrfTestsART: Fix esdmerge test choice

See merge request !69172

Tools/TrfTestsART/test/test_trf_esdmerge_serial.sh

-#!/bin/bash
-#
-# art-description: ESDMerge_tf.py serial
-# art-type: grid
-# art-include: 24.0/Athena
-
-ESDMerge_tf.py \
-    --inputESDFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/DESDM_MCP.26614755._001203.pool.root.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/DESDM_MCP.26614755._001208.pool.root.1 \
-    --postInclude="all:PyJobTransforms/UseFrontier.py" \
-    --autoConfiguration="everything" \
-    --conditionsTag="all:CONDBR2-BLKPA-RUN2-11" \
-    --geometryVersion="all:ATLAS-R2-2016-01-00-01" \
-    --runNumber="358031" \
-    --outputESD_MRGFile="DESDM_MCP.pool.root" \
-    --postExec 'FPEAuditor.NStacktracesOnFPE=10' \
-    --AMITag="p4756" 
-
-rc1=$?
-echo "art-result: ${rc1} ESDMerge_tf_serial"
-
-# Check for FPEs in the logiles
-test_trf_check_fpe.sh
-fpeStat=$?
-
-echo "art-result: ${fpeStat} FPEs in logfiles"

Tools/TrfTestsART/test/test_trf_esdmerge_serial_ca.sh

@@ -3,6 +3,7 @@
 # art-description: ESDMerge_tf.py serial CA
 # art-type: grid
 # art-include: main/Athena
+# art-include: main/24.0
 
 ESDMerge_tf.py --CA \
     --inputESDFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/DESDM_MCP.26614755._001203.pool.root.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/DESDM_MCP.26614755._001208.pool.root.1 \