From b1e1646d945d8f7e15c7828a9a5fb0fc4f516f51 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 23 Jul 2014 22:21:04 +0200 Subject: Buildbot: more fixes, this time to upload logic. We do not want testbuild to override 'official' (master) builds! --- build_files/buildbot/slave_rsync.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'build_files/buildbot/slave_rsync.py') diff --git a/build_files/buildbot/slave_rsync.py b/build_files/buildbot/slave_rsync.py index 6936232a495..5d25ca7e6fe 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) -- cgit v1.2.3