Buildbot: proper fix for 'testbuild overriding master builds' issue.
This commit is contained in:
parent
b2170b9194
commit
23660438ad
|
@ -148,6 +148,7 @@ def schedule_build(name, hour, minute=0):
|
|||
# Note that any particular build will only take place on one slave.
|
||||
|
||||
from buildbot.process.factory import BuildFactory
|
||||
from buildbot.process.properties import Interpolate
|
||||
from buildbot.steps.source import SVN
|
||||
from buildbot.steps.source import Git
|
||||
from buildbot.steps.shell import ShellCommand
|
||||
|
@ -264,7 +265,7 @@ def generic_builder(id, libdir='', branch='', rsync=False):
|
|||
f.addStep(Compile(command=['python', compile_script, id], timeout=3600))
|
||||
f.addStep(Test(command=['python', test_script, id]))
|
||||
f.addStep(ShellCommand(name='package',
|
||||
command=['python', pack_script, id, branch],
|
||||
command=['python', pack_script, id, branch or Interpolate('%(src:blender:branch)s')],
|
||||
description='packaging',
|
||||
descriptionDone='packaged'))
|
||||
if rsync:
|
||||
|
|
Loading…
Reference in New Issue