diff -rN -u old-upstream-buildbot-mirror/buildbot/process/base.py new-upstream-buildbot-mirror/buildbot/process/base.py
old
|
new
|
|
186 | 186 | def setLocks(self, locks): |
187 | 187 | self.locks = locks |
188 | 188 | |
| 189 | def setSlaveEnvironment(self, env): |
| 190 | self.slaveEnvironment = env |
| 191 | |
189 | 192 | def getSourceStamp(self): |
190 | 193 | return self.source |
191 | 194 | |
diff -rN -u old-upstream-buildbot-mirror/buildbot/process/builder.py new-upstream-buildbot-mirror/buildbot/process/builder.py
old
|
new
|
|
276 | 276 | self.builddir = setup['builddir'] |
277 | 277 | self.buildFactory = setup['factory'] |
278 | 278 | self.locks = setup.get("locks", []) |
| 279 | self.env = setup.get(['env'], {}) |
| 280 | assert isinstance(self.env, dict) |
279 | 281 | if setup.has_key('periodicBuildTime'): |
280 | 282 | raise ValueError("periodicBuildTime can no longer be defined as" |
281 | 283 | " part of the Builder: use scheduler.Periodic" |
… |
… |
|
585 | 587 | build = self.buildFactory.newBuild(requests) |
586 | 588 | build.setBuilder(self) |
587 | 589 | build.setLocks(self.locks) |
| 590 | if len(self.env) > 0: |
| 591 | build.setSlaveEnvironment(self.env) |
588 | 592 | |
589 | 593 | # start it |
590 | 594 | self.startBuild(build, sb) |