[Bf-blender-cvs] [95e2ee6] master: Buildbot: Always expect buildbot_upload.zip to be in install/ folder
Sergey Sharybin
noreply at git.blender.org
Thu Dec 3 11:17:55 CET 2015
Commit: 95e2ee6f501eb9a0454057413046995e4a9d06e1
Author: Sergey Sharybin
Date: Thu Dec 3 15:15:38 2015 +0500
Branches: master
https://developer.blender.org/rB95e2ee6f501eb9a0454057413046995e4a9d06e1
Buildbot: Always expect buildbot_upload.zip to be in install/ folder
This we we don't have difference between builders on different platforms.
===================================================================
M build_files/buildbot/master.cfg
M build_files/buildbot/slave_pack.py
===================================================================
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index 7b8dd17..02927f7 100644
--- a/build_files/buildbot/master.cfg
+++ b/build_files/buildbot/master.cfg
@@ -282,11 +282,6 @@ def generic_builder(id, libdir='', branch='', rsync=False):
descriptionDone='packaged'))
if rsync:
f.addStep(rsync_step(id, branch, rsync_script))
- elif id.find('cmake') != -1:
- f.addStep(FileUpload(name='upload',
- slavesrc='buildbot_upload.zip',
- masterdest=filename,
- maxsize=150 * 1024 * 1024))
else:
f.addStep(FileUpload(name='upload',
slavesrc='buildbot_upload.zip',
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index 44ff385..1e7cf68 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -160,7 +160,7 @@ else:
os.rename(result_file, "{}.zip".format(builderified_name))
# create zip file
try:
- upload_zip = "../buildbot_upload.zip"
+ upload_zip = "../install/buildbot_upload.zip"
if os.path.exists(upload_zip):
os.remove(upload_zip)
z = zipfile.ZipFile(upload_zip, "w", compression=zipfile.ZIP_STORED)
More information about the Bf-blender-cvs
mailing list