Merge branch 'cherry-pick-7c40e9d8-21.0' into '21.0'

Sweeping !20514 from master to 21.0.
Start versioning the CI reference files for the RunTier0Tests

See merge request atlas/athena!20543

Tools/PROCTools/python/RunTier0Tests.py

@@ -12,6 +12,7 @@ import time
 import uuid
 import logging
 import glob
+from RunTier0TestsTools import ciRefFileMap
 
 ### Setup global logging
 logging.basicConfig(level=logging.INFO,
@@ -300,17 +301,17 @@ def RunFrozenTier0PolicyTest(q,inputFormat,maxEvents,CleanRunHeadDir,UniqID,RunP
     clean_dir = CleanRunHeadDir+"/clean_run_"+q+"_"+UniqID
 
     if RunPatchedOnly: #overwrite
-        # Resolve the subfolder first. Results are stored like: main_folder/q-test/branch/.
+        # Resolve the subfolder first. Results are stored like: main_folder/q-test/branch/version/.
         # This should work both in standalone and CI
         subfolder = os.environ['AtlasVersion'][0:4]
         # Use EOS if mounted, otherwise CVMFS
-        clean_dir = '/eos/atlas/atlascerngroupdisk/data-art/grid-input/Tier0ChainTests/{0}/{1}'.format(q,subfolder)
+        clean_dir = '/eos/atlas/atlascerngroupdisk/data-art/grid-input/Tier0ChainTests/{0}/{1}/{2}'.format(q,subfolder,ciRefFileMap['{0}-{1}'.format(q,subfolder)])
         if(glob.glob(clean_dir)):
             logging.info("EOS is mounted, going to read the reference files from there instead of CVMFS")
             clean_dir = 'root://eosatlas.cern.ch/'+clean_dir # In case outside CERN
         else:
             logging.info("EOS is not mounted, going to read the reference files from CVMFS")
-            clean_dir = '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/{0}/{1}'.format(q,subfolder)
+            clean_dir = '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/{0}/{1}/{2}'.format(q,subfolder,ciRefFileMap['{0}-{1}'.format(q,subfolder)])
 
     logging.info("Reading the reference file from location "+clean_dir)
 

Tools/PROCTools/python/RunTier0TestsTools.py

+#!/usr/bin/env python
+
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+#####
+# CI Reference Files Map
+#####
+
+# The top-level directory for the files is /eos/atlas/atlascerngroupdisk/data-art/grid-input/Tier0ChainTests/
+# Then the subfolders follow the format test/branch/version, i.e. for q221 in 21.0 the reference files are under
+# /eos/atlas/atlascerngroupdisk/data-art/grid-input/Tier0ChainTests/q221/21.0/v1 for v1 version
+
+# Format is "test-branch" : "version"
+ciRefFileMap = {
+                # qTestsTier0_required-test
+                'q221-21.0'            : 'v1',
+                'q431-21.0'            : 'v1',
+                'q221-21.3'            : 'v1',
+                'q431-21.3'            : 'v1',
+                # SimulationTier0Test_required-test
+                's3126-21.0'           : 'v1',
+                's3126-21.3'           : 'v1',
+                's3126-21.9'           : 'v1',
+                's3126-22.0'           : 'v1',
+                # OverlayTier0Test_required-test
+                'overlay-d1498-21.0'   : 'v1',
+                'overlay-d1498-22.0'   : 'v1',
+               }