From c42c41546bfdbf6b281bfdf078c1392b6fb83f8c Mon Sep 17 00:00:00 2001
From: Catrin Bernius <catrin.bernius@cern.ch>
Date: Thu, 15 Nov 2018 14:53:48 +0000
Subject: [PATCH] Merge branch 'update-trigger-ART' into '21.1'
fixes for trigger ART test monitoring
See merge request atlas/athena!15910
(cherry picked from commit f5551669e5159ab843bacdd6fa78b7eefe9b9cef [formerly 1c9b8fea52da5908ee4fbb728f9087a2d51152df])
1e8a8f14 fixes for trigger ART test monitoring
Former-commit-id: 6a48fd4ae05b838ad37b1a07c14fc284bd02912b
---
Control/AthenaConfiguration/python/iconfTool/gui/__init__.py | 0
.../AthenaConfiguration/python/iconfTool/utils/__init__.py | 0
.../TriggerTest/test/exec_art_triggertest_post.sh | 4 +++-
3 files changed, 3 insertions(+), 1 deletion(-)
mode change 100755 => 100644 Control/AthenaConfiguration/python/iconfTool/gui/__init__.py
mode change 100755 => 100644 Control/AthenaConfiguration/python/iconfTool/utils/__init__.py
diff --git a/Control/AthenaConfiguration/python/iconfTool/gui/__init__.py b/Control/AthenaConfiguration/python/iconfTool/gui/__init__.py
old mode 100755
new mode 100644
diff --git a/Control/AthenaConfiguration/python/iconfTool/utils/__init__.py b/Control/AthenaConfiguration/python/iconfTool/utils/__init__.py
old mode 100755
new mode 100644
diff --git a/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh b/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh
index 7830134f51c..c2cac9f9814 100755
--- a/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh
@@ -13,7 +13,7 @@ if [ -z ${TEST} ]; then
fi
if [ -z ${REF_FOLDER} ]; then
- export REF_FOLDER="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/${TEST}/ref/${AtlasBuildBranch}/${NAME}"
+ export REF_FOLDER="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/${TEST}/ref/${AtlasBuildBranch}/test_${NAME}"
fi
###
@@ -33,6 +33,8 @@ timeout 1m chainDump.py -S --rootFile=expert-monitoring.root
export JOB_LOG_TAIL=${JOB_LOG%%.*}.tail.${JOB_LOG#*.}
tail -10000 ${JOB_LOG} > ${JOB_LOG_TAIL}
+grep REGTEST athena.log > athena.regtest
+
if [ -f ${REF_FOLDER}/athena.regtest ]; then
echo $(date "+%FT%H:%M %Z")" Running regtest"
grep REGTEST athena.log > athena.regtest
--
GitLab