patches/bb-props_master_fix.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15

diff --git a/buildbot/process/builder.py b/buildbot/process/builder.py
index df8f9c014..c16e4f64e 100644
--- a/buildbot/process/builder.py
+++ b/buildbot/process/builder.py
@@ -288,6 +288,10 @@ class Builder(util_service.ReconfigurableServiceMixin,
             # The instance type of the worker may depend on the properties of
             # the build that substantiated it.
             props = yield self._setup_props_if_needed(props, workerforbuilder, buildrequest)
+            # check if we have props.master when we call renderWorkerProps later
+            # set props.master if needed
+            if props.master is None:
+                props.master = self.master
             can_start = yield worker.isCompatibleWithBuild(props)
             if not can_start:
                 return False