diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-07-24 00:33:37 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-07-24 00:33:37 +0400 |
| commit | 23660438ad00b3b38fb60fc1428ed4075de47314 (patch) | |
| tree | 6434ce7479ce82d423fa8fd2884931b8561c9c8d /build_files | |
| parent | b2170b91942f22b5fd554ba3e96b00469b662e47 (diff) | |
Buildbot: proper fix for 'testbuild overriding master builds' issue.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/master.cfg | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index d5bc8b97f22..1762ee69c83 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -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: |