From d8fdccbed4a2614086295105e9249eebbcf00172 Mon Sep 17 00:00:00 2001
From: Spyridon Argyropoulos <spyridon.argyropoulos@cern.ch>
Date: Fri, 4 Dec 2020 15:29:01 +0100
Subject: [PATCH 1/2] Skip athena running for CC7 releases

---
 scripts/commit_new_dsid.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/commit_new_dsid.sh b/scripts/commit_new_dsid.sh
index b29572206e..13fbc4af09 100755
--- a/scripts/commit_new_dsid.sh
+++ b/scripts/commit_new_dsid.sh
@@ -376,7 +376,7 @@ for dsid in "${newDSID[@]}" ; do
     # Pass the decision to skip Gen_tf in the run_athena CI job, so that when 
     grep 'inputGeneratorFile' $tmpLogParserOut >> $dsiddir/log.generate.short
     grep 'LHEonly' $tmpLogParserOut >> $dsiddir/log.generate.short
-
+        
     # Check if job lasts more than 1h - this will cause the pipeline to fail
     if [[ $skipAthena == false ]] ; then
       cpu=$(grep CPU $dsiddir/log.generate.short | awk '{print $8}')
@@ -392,7 +392,15 @@ for dsid in "${newDSID[@]}" ; do
         fi
       fi
     fi
-    
+
+    # Check if the release is < 21.6.51 otherwise CC7 needs to be used which is currently not implemented in the CI
+    relVersion=$(grep 'using release' $tmpLogParserOut | awk -F'AthGeneration-' '{print $2}' | sed 's/\.//g')
+    if (( relVersion >= 21651 )) ; then
+        printInfo -f "\tRelease $relVersion used. Cannot run athena in CI with CC7 so removing log.generate.short file"
+        rm -f log.generate.short
+        skipAthena=true
+    fi
+
     # Remove logParser output file
     rm -f $tmpLogParserOut
   fi
-- 
GitLab


From e59bc112bd4640096c3e1cf763549ae29fa1f7c5 Mon Sep 17 00:00:00 2001
From: Spyridon Argyropoulos <spyridon.argyropoulos@cern.ch>
Date: Fri, 4 Dec 2020 15:39:14 +0100
Subject: [PATCH 2/2] Small fix

---
 scripts/commit_new_dsid.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/commit_new_dsid.sh b/scripts/commit_new_dsid.sh
index 13fbc4af09..da593093c3 100755
--- a/scripts/commit_new_dsid.sh
+++ b/scripts/commit_new_dsid.sh
@@ -397,7 +397,7 @@ for dsid in "${newDSID[@]}" ; do
     relVersion=$(grep 'using release' $tmpLogParserOut | awk -F'AthGeneration-' '{print $2}' | sed 's/\.//g')
     if (( relVersion >= 21651 )) ; then
         printInfo -f "\tRelease $relVersion used. Cannot run athena in CI with CC7 so removing log.generate.short file"
-        rm -f log.generate.short
+        rm -f $dsiddir/log.generate.short
         skipAthena=true
     fi
 
-- 
GitLab