kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Revert "Buildbot: more fixes, this time to upload logic."

Browse Source 
This reverts commit b1e1646d945d8f7e15c7828a9a5fb0fc4f516f51.

Sorry, was a bit too quick on this one... :/
This commit is contained in:
Bastien Montagne 2014-07-23 22:28:02 +02:00
parent b1e1646d94
commit b2170b9194
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/buildbot/master.cfg
View File

@ -148,7 +148,6 @@ def schedule_build(name, hour, minute=0):
# Note that any particular build will only take place on one slave. # Note that any particular build will only take place on one slave.
from buildbot.process.factory import BuildFactory from buildbot.process.factory import BuildFactory
from buildbot.process.properties import Interpolate
from buildbot.steps.source import SVN from buildbot.steps.source import SVN
from buildbot.steps.source import Git from buildbot.steps.source import Git
from buildbot.steps.shell import ShellCommand from buildbot.steps.shell import ShellCommand
@ -238,12 +237,11 @@ def rsync_step(id, branch, rsync_script):
descriptionDone='uploaded', descriptionDone='uploaded',
workdir='install') workdir='install')
# generic builder # generic builder
def generic_builder(id, libdir='', branch='', rsync=False): 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' compile_script = '../blender.git/build_files/buildbot/slave_compile.py'
test_script = '../blender.git/build_files/buildbot/slave_test.py' test_script = '../blender.git/build_files/buildbot/slave_test.py'
pack_script = '../blender.git/build_files/buildbot/slave_pack.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', description='packaging',
descriptionDone='packaged')) descriptionDone='packaged'))
if rsync: 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: elif id.find('cmake') != -1:
f.addStep(FileUpload(name='upload', f.addStep(FileUpload(name='upload',
slavesrc='buildbot_upload.zip', slavesrc='buildbot_upload.zip',

7
build_files/buildbot/slave_rsync.py
View File

@ -25,17 +25,16 @@ import os
import sys import sys
# get builder name # get builder name
if len(sys.argv) < 3: if len(sys.argv) < 2:
sys.stderr.write("Not enough arguments, expecting builder and branch names\n") sys.stderr.write("Not enough arguments, expecting builder name\n")
sys.exit(1) sys.exit(1)
builder = sys.argv[1] builder = sys.argv[1]
branch = sys.argv[2]
# rsync, this assumes ssh keys are setup so no password is needed # rsync, this assumes ssh keys are setup so no password is needed
local_zip = "buildbot_upload.zip" local_zip = "buildbot_upload.zip"
remote_folder = "builder.blender.org:/data/buildbot-master/uploaded/" 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) command = "rsync -avz %s %s" % (local_zip, remote_zip)
print(command) print(command)