From b2170b91942f22b5fd554ba3e96b00469b662e47 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 23 Jul 2014 22:28:02 +0200 Subject: Revert "Buildbot: more fixes, this time to upload logic." This reverts commit b1e1646d945d8f7e15c7828a9a5fb0fc4f516f51. Sorry, was a bit too quick on this one... :/ --- build_files/buildbot/master.cfg | 6 ++---- build_files/buildbot/slave_rsync.py | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'build_files') diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index f999695033f..d5bc8b97f22 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -148,7 +148,6 @@ 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 @@ -238,12 +237,11 @@ def rsync_step(id, branch, rsync_script): descriptionDone='uploaded', workdir='install') - # generic builder def generic_builder(id, libdir='', branch='', rsync=False): - filename = Interpolate('uploaded/buildbot_upload_' + id + '_%(src:blender:branch)s.zip') + filename = 'uploaded/buildbot_upload_' + id + '.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' @@ -270,7 +268,7 @@ def generic_builder(id, libdir='', branch='', rsync=False): description='packaging', descriptionDone='packaged')) if rsync: - f.addStep(rsync_step(id, branch or Interpolate('%(src:blender:branch)s'), rsync_script)) + f.addStep(rsync_step(id, branch, 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 5d25ca7e6fe..6936232a495 100644 --- a/build_files/buildbot/slave_rsync.py +++ b/build_files/buildbot/slave_rsync.py @@ -25,17 +25,16 @@ import os import sys # get builder name -if len(sys.argv) < 3: - sys.stderr.write("Not enough arguments, expecting builder and branch names\n") +if len(sys.argv) < 2: + sys.stderr.write("Not enough arguments, expecting builder name\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 + "_" + branch + ".zip" +remote_zip = remote_folder + "buildbot_upload_" + builder + ".zip" command = "rsync -avz %s %s" % (local_zip, remote_zip) print(command) -- cgit v1.2.3