From 1b3930f64a03cfc1c1f1a1fd04f90352a1229fc0 Mon Sep 17 00:00:00 2001
From: Kevin Pedro <kpedro88@gmail.com>
Date: Thu, 2 Dec 2021 22:03:05 +0100
Subject: [PATCH] implement step skipping more consistently

---
 .../python/upgradeWorkflowComponents.py               | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
index fb9e069a79324..54cc1c763eef3 100644
--- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
+++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -446,6 +446,8 @@ def __init__(self, digi = {}, reco = {}, harvest = {}, **kwargs):
                 'HARVESTGlobal',
                 'RecoNano',
                 'HARVESTNano',
+                'Nano',
+                'ALCA',
             ],
             PU = [],
             **kwargs)
@@ -467,14 +469,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: