[Bf-blender-cvs] [b1e1646] master: Buildbot: more fixes, this time to upload logic.
Bastien Montagne
noreply at git.blender.org
Wed Jul 23 22:22:29 CEST 2014
Commit: b1e1646d945d8f7e15c7828a9a5fb0fc4f516f51
Author: Bastien Montagne
Date: Wed Jul 23 22:21:04 2014 +0200
Branches: master
https://developer.blender.org/rBb1e1646d945d8f7e15c7828a9a5fb0fc4f516f51
Buildbot: more fixes, this time to upload logic.
We do not want testbuild to override 'official' (master) builds!
===================================================================
M build_files/buildbot/master.cfg
M build_files/buildbot/slave_rsync.py
===================================================================
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index d5bc8b9..f999695 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
@@ -237,11 +238,12 @@ def rsync_step(id, branch, rsync_script):
descriptionDone='uploaded',
workdir='install')
+
# generic builder
def generic_builder(id, libdir='', branch='', rsync=False):
- filename = 'uploaded/buildbot_upload_' + id + '.zip'
+ filename = Interpolate('uploaded/buildbot_upload_' + id + '_%(src:blender:branch)s.zip')
compile_script = '../blender.git/build_files/buildbot/slave_compile.py'
test_script = '../blender.git/build_files/buildbot/slave_test.py'
pack_script = '../blender.git/build_files/buildbot/slave_pack.py'
@@ -268,7 +270,7 @@ def generic_builder(id, libdir='', branch='', rsync=False):
description='packaging',
descriptionDone='packaged'))
if rsync:
- f.addStep(rsync_step(id, branch, rsync_script))
+ f.addStep(rsync_step(id, branch or Interpolate('%(src:blender:branch)s'), rsync_script))
elif id.find('cmake') != -1:
f.addStep(FileUpload(name='upload',
slavesrc='buildbot_upload.zip',
diff --git a/build_files/buildbot/slave_rsync.py b/build_files/buildbot/slave_rsync.py
index 6936232..5d25ca7 100644
--- a/build_files/buildbot/slave_rsync.py
+++ b/build_files/buildbot/slave_rsync.py
@@ -25,16 +25,17 @@ import os
import sys
# get builder name
-if len(sys.argv) < 2:
- sys.stderr.write("Not enough arguments, expecting builder name\n")
+if len(sys.argv) < 3:
+ sys.stderr.write("Not enough arguments, expecting builder and branch names\n")
sys.exit(1)
builder = sys.argv[1]
+branch = sys.argv[2]
# rsync, this assumes ssh keys are setup so no password is needed
local_zip = "buildbot_upload.zip"
remote_folder = "builder.blender.org:/data/buildbot-master/uploaded/"
-remote_zip = remote_folder + "buildbot_upload_" + builder + ".zip"
+remote_zip = remote_folder + "buildbot_upload_" + builder + "_" + branch + ".zip"
command = "rsync -avz %s %s" % (local_zip, remote_zip)
print(command)
More information about the Bf-blender-cvs
mailing list