Merge pull request #36341 from kpedro88/Phase2-WF77

implement step skipping more consistently for Patatrack workflows
cms-sw · Dec 3, 2021 · 6d449f5 · 6d449f5
2 parents aab0324 + 1b3930f
commit 6d449f5
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -448,6 +448,8 @@ def __init__(self, digi = {}, reco = {}, harvest = {}, **kwargs):
                 'HARVESTGlobal',
                 'RecoNano',
                 'HARVESTNano',
+                'Nano',
+                'ALCA',
             ],
             PU = [],
             **kwargs)
@@ -469,14 +471,13 @@ def condition(self, fragment, stepList, key, hasHarvest):
         ]
         result = any(selected) and hasHarvest
 
-        # skip ALCA and Nano steps (but not RecoNano or HARVESTNano for Run3)
-        for skip in copy(stepList):
-            if ("ALCA" in skip) or ("Nano"==skip):
-                stepList.remove(skip)
         return result
 
     def setup_(self, step, stepName, stepDict, k, properties):
-        if 'Digi' in step:
+        # skip ALCA and Nano steps (but not RecoNano or HARVESTNano for Run3)
+        if 'ALCA' in step or 'Nano'==step:
+            stepDict[stepName][k] = None
+        elif 'Digi' in step:
             if self.__digi is None:
               stepDict[stepName][k] = None
             else: