Only persist non-runtime properties in rebuilds.

Properties which are set at runtime by a build step
should not be persisted to a new build. Fixes #889.

master/buildbot/process/builder.py

@@ -976,12 +976,11 @@ def rebuildBuild(self, bs, reason="<rebuild, no reason given>", extraProperties=
             return
 
         ss = bs.getSourceStamp(absolute=True)
+        # Make a copy so as not to modify the original build.
+        properties = Properties()
+        # Don't include runtime-set properties in a rebuild request
+        properties.updateFromPropertiesNoRuntime(bs.getProperties())
         if extraProperties is None:
-            properties = bs.getProperties()
-        else:
-            # Make a copy so as not to modify the original build.
-            properties = Properties()
-            properties.updateFromProperties(bs.getProperties())
             properties.updateFromProperties(extraProperties)
         self.submitBuildRequest(ss, reason, props=properties)
 

master/buildbot/process/buildstep.py

@@ -671,8 +671,8 @@ def setProgress(self, metric, value):
     def getProperty(self, propname):
         return self.build.getProperty(propname)
 
-    def setProperty(self, propname, value, source="Step"):
-        self.build.setProperty(propname, value, source)
+    def setProperty(self, propname, value, source="Step", runtime=True):
+        self.build.setProperty(propname, value, source, runtime=runtime)
 
     def startStep(self, remote):
         """Begin the step. This returns a Deferred that will fire when the

master/buildbot/process/properties.py

@@ -25,6 +25,9 @@ def __init__(self, **kwargs):
         @param kwargs: initial property values (for testing)
         """
         self.properties = {}
+        # Track keys which are 'runtime', and should not be
+        # persisted if a build is rebuilt
+        self.runtime = set()
         self.pmap = PropertyMap(self)
         if kwargs: self.update(kwargs, "TEST")
 
@@ -64,17 +67,29 @@ def asList(self):
     def __repr__(self):
         return repr(dict([ (k,v[0]) for k,v in self.properties.iteritems() ]))
 
-    def setProperty(self, name, value, source):
+    def setProperty(self, name, value, source, runtime=False):
         self.properties[name] = (value, source)
+        if runtime:
+            self.runtime.add(name)
 
-    def update(self, dict, source):
+    def update(self, dict, source, runtime=False):
         """Update this object from a dictionary, with an explicit source specified."""
         for k, v in dict.items():
             self.properties[k] = (v, source)
+            if runtime:
+                self.runtime.add(k)
 
     def updateFromProperties(self, other):
         """Update this object based on another object; the other object's """
         self.properties.update(other.properties)
+        self.runtime.update(other.runtime)
+
+    def updateFromPropertiesNoRuntime(self, other):
+        """Update this object based on another object, but don't
+        include properties that were marked as runtime."""
+        for k,v in other.properties.iteritems():
+            if k not in other.runtime:
+                self.properties[k] = v
 
     def render(self, value):
         """