diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-12-03 13:15:38 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-12-03 13:16:48 +0300 |
| commit | 95e2ee6f501eb9a0454057413046995e4a9d06e1 (patch) | |
| tree | 72a9828016623cdacfdbac32f6996f85edcf4f77 /build_files/buildbot | |
| parent | 7cb9b49f73f1c172e3cfc29cbf5dec74c0a10c26 (diff) | |
Buildbot: Always expect buildbot_upload.zip to be in install/ folder
This we we don't have difference between builders on different platforms.
Diffstat (limited to 'build_files/buildbot')
| -rw-r--r-- | build_files/buildbot/master.cfg | 5 | ||||
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 7b8dd175453..02927f7fa4c 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 44ff385cf79..1e7cf684169 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) |