From f9ae66429c1532909b0bb101c2b6034808f3e7ef Mon Sep 17 00:00:00 2001
From: Olga Igonkina <olga.igonkina@cern.ch>
Date: Thu, 25 Oct 2018 15:33:58 +0000
Subject: [PATCH] Merge branch 'TrigP1Test_disablepp' into '21.1'

TrigP1Test: disabling pp DB tests

See merge request atlas/athena!15344

(cherry picked from commit 643fb82a116e319c74392cbb9106b58422937c38)

1bd8f993 TrigP1Test: disabling pp DB tests
---
 .../python/iconfTool/gui/__init__.py          |  0
 .../python/iconfTool/utils/__init__.py        |  0
 .../test/test_HLT_physicsV7_menu_build.sh     | 80 +++++++++----------
 3 files changed, 40 insertions(+), 40 deletions(-)
 mode change 100644 => 100755 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 100644
new mode 100755
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/TrigP1Test/test/test_HLT_physicsV7_menu_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_menu_build.sh
index 81fafcd1f94..f517e79bdab 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_menu_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_menu_build.sh
@@ -8,67 +8,67 @@ if [ -z ${TEST} ]; then
   export TEST="TrigP1Test"
 fi
 
-export NAME=HLT_physicsV7_menu
-export JOB_LOG="${NAME}.log"
+#export NAME=HLT_physicsV7_menu
+#export JOB_LOG="${NAME}.log"
 
-timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
+#timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
 
-ATH_RETURN=${PIPESTATUS[0]}
-echo "art-result: ${ATH_RETURN} ${NAME}"
+#ATH_RETURN=${PIPESTATUS[0]}
+#echo "art-result: ${ATH_RETURN} ${NAME}"
 
-export NAME=UploadMenuKeys
-export JOB_LOG="${NAME}.log"
+#export NAME=UploadMenuKeys
+#export JOB_LOG="${NAME}.log"
 
-timeout 120m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
+#timeout 120m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
 
-ATH_RETURN=${PIPESTATUS[0]}
-echo "art-result: ${ATH_RETURN} ${NAME}"
+#ATH_RETURN=${PIPESTATUS[0]}
+#echo "art-result: ${ATH_RETURN} ${NAME}"
 
-export NAME=HLT_physicsV7_menu_rerundb
-export JOB_LOG="${NAME}.log"
+#export NAME=HLT_physicsV7_menu_rerundb
+#export JOB_LOG="${NAME}.log"
 
-timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
+#timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
 
-ATH_RETURN=${PIPESTATUS[0]}
-echo "art-result: ${ATH_RETURN} ${NAME}"
+#ATH_RETURN=${PIPESTATUS[0]}
+#echo "art-result: ${ATH_RETURN} ${NAME}"
 
-export NAME=HLT_physicsV7_menu_checkkeys
-export JOB_LOG="${NAME}.log"
+#export NAME=HLT_physicsV7_menu_checkkeys
+#export JOB_LOG="${NAME}.log"
 
-timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
+#timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
 
-ATH_RETURN=${PIPESTATUS[0]}
-echo "art-result: ${ATH_RETURN} ${NAME}"
+#ATH_RETURN=${PIPESTATUS[0]}
+#echo "art-result: ${ATH_RETURN} ${NAME}"
 
-export NAME=CheckKeysV7
-export JOB_LOG="${NAME}.log"
+#export NAME=CheckKeysV7
+#export JOB_LOG="${NAME}.log"
 
-timeout 180m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
+#timeout 180m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
 
-ATH_RETURN=${PIPESTATUS[0]}
-echo "art-result: ${ATH_RETURN} ${NAME}"
+#ATH_RETURN=${PIPESTATUS[0]}
+#echo "art-result: ${ATH_RETURN} ${NAME}"
 
-export NAME=HLT_physicsV7_rerunLVL1_menu
-export JOB_LOG="${NAME}.log"
+#export NAME=HLT_physicsV7_rerunLVL1_menu
+#export JOB_LOG="${NAME}.log"
 
-timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
+#timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
 
-ATH_RETURN=${PIPESTATUS[0]}
-echo "art-result: ${ATH_RETURN} ${NAME}"
+#ATH_RETURN=${PIPESTATUS[0]}
+#echo "art-result: ${ATH_RETURN} ${NAME}"
 
-export NAME=UploadMenuKeys_rerunLVL1
-export JOB_LOG="${NAME}.log"
+#export NAME=UploadMenuKeys_rerunLVL1
+#export JOB_LOG="${NAME}.log"
 
-timeout 120m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
+#timeout 120m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
 
-ATH_RETURN=${PIPESTATUS[0]}
-echo "art-result: ${ATH_RETURN} ${NAME}"
+#ATH_RETURN=${PIPESTATUS[0]}
+#echo "art-result: ${ATH_RETURN} ${NAME}"
 
-export NAME=HLT_physicsV7_rerunLVL1_menu_rerundb
-export JOB_LOG="${NAME}.log"
+#export NAME=HLT_physicsV7_rerunLVL1_menu_rerundb
+#export JOB_LOG="${NAME}.log"
 
-timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
+#timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}
 
-ATH_RETURN=${PIPESTATUS[0]}
-echo "art-result: ${ATH_RETURN} ${NAME}"
+#ATH_RETURN=${PIPESTATUS[0]}
+#echo "art-result: ${ATH_RETURN} ${NAME}"
 
-- 
GitLab