Ticket #414: alwaysrun.patch

process/base.py

@@ -182 +182 @@
         self.currentStep = None
         self.slaveEnvironment = {}
 
+        self.terminate = False
+
     def setBuilder(self, builder):
         """
         Set the given builder as our builder.
@@ -450 +452 @@
         is complete."""
         if not self.steps:
             return None
-        return self.steps.pop(0)
+        if self.terminate:
+            while True:
+                s = self.steps.pop(0)
+                if s.alwaysRun:
+                    return s
+                if not self.steps:
+                    return None
+        else:
+            return self.steps.pop(0)
 
     def startNextStep(self):
         try:
@@ -470 +480 @@
             return # build was interrupted, don't keep building
         terminate = self.stepDone(results, step) # interpret/merge results
         if terminate:
-            return self.allStepsDone()
-        self.startNextStep()
+            self.terminate = True
+        return self.startNextStep()
 
     def stepDone(self, result, step):
         """This method is called when the BuildStep completes. It is passed a

process/buildstep.py

@@ -544 +544 @@
     # immediately, the others will be taken into consideration when
     # determining the overall build status.
     #
+    # steps that are makred as alwaysRun will be run regardless of the outcome
+    # of previous steps (especially steps with haltOnFailure=True)
     haltOnFailure = False
     flunkOnWarnings = False
     flunkOnFailure = False
     warnOnWarnings = False
     warnOnFailure = False
+    alwaysRun = False
 
     # 'parms' holds a list of all the parameters we care about, to allow
     # users to instantiate a subclass of BuildStep with a mixture of
@@ -563 +566 @@
              'flunkOnFailure',
              'warnOnWarnings',
              'warnOnFailure',
+             'alwaysRun',
              'progressMetrics',
              ]