From 7e1367f109145d11d592a60611e3ad9bccb93194 Mon Sep 17 00:00:00 2001
From: Katherine Pachal <katepachal@gmail.com>
Date: Wed, 19 Sep 2018 17:43:43 +0000
Subject: [PATCH] Merge branch 'TrigAnalysisTest-fixTrigNavSlim' into '21.1'
Remove TrigNavSlimming post processing for "rdotoesdaod" ART tests in AthenaP1 branches. Fixes ATR-18611
See merge request atlas/athena!14332
(cherry picked from commit 55e8ad42776cf311d407ca947ef1184bd21ba4bf)
3bb6db61 Remove TrigNavSlimming post processing for "rdotoesdaod" ART tests in AthenaP1 branches
---
.../test/exec_art_triganalysistest_post.sh | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/exec_art_triganalysistest_post.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/exec_art_triganalysistest_post.sh
index 5f619100a644..91c319565bd6 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/exec_art_triganalysistest_post.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/exec_art_triganalysistest_post.sh
@@ -72,12 +72,18 @@ fi
echo "#######################################"
echo $(date "+%FT%H:%M %Z")" Test AthenaTrigAODtoAOD_TrigNavSlimming"
-export SLIM_LOG=${JOB_LOG%%.*}.TrigNavSlimming.${JOB_LOG#*.}
-athena.py -c 'TestType="RSegamma";useCONDBR2=False;' -b TrigAnalysisTest/testAthenaTrigAODtoAOD_TrigNavSlimming.py | tee ${SLIM_LOG}
-echo "art-result: ${PIPESTATUS[0]} ${SLIM_LOG%.*}"
-echo $(date "+%FT%H:%M %Z")" Running checklog"
-timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${SLIM_LOG} | tee checklog.TrigNavSlimming.log
-echo "art-result: ${PIPESTATUS[0]} CheckLog.TrigNavSlimming"
+echo "AtlasProject" $AtlasProject
+if [ $AtlasProject = "AthenaP1" ]; then
+ echo "This is AthenaP1 so not running TrigNavSlimming test"
+else
+ export SLIM_LOG=${JOB_LOG%%.*}.TrigNavSlimming.${JOB_LOG#*.}
+ athena.py -c 'TestType="RSegamma";useCONDBR2=False;' -b TrigAnalysisTest/testAthenaTrigAODtoAOD_TrigNavSlimming.py | tee ${SLIM_LOG}
+ echo "art-result: ${PIPESTATUS[0]} ${SLIM_LOG%.*}"
+ echo $(date "+%FT%H:%M %Z")" Running checklog"
+ timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${SLIM_LOG} | tee checklog.TrigNavSlimming.log
+ echo "art-result: ${PIPESTATUS[0]} CheckLog.TrigNavSlimming"
+fi
+
if [ -f AOD.pool.root ]; then
echo $(date "+%FT%H:%M %Z")" Running CheckFile on AOD"
timeout 10m checkFile.py AOD.pool.root | tee AOD.pool.root.checkFile
--
GitLab