diff options
Diffstat (limited to 'build_files/buildbot/master.cfg')
| -rw-r--r-- | build_files/buildbot/master.cfg | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 7b8dd175453..b506f12b21b 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', @@ -303,8 +298,10 @@ def generic_builder(id, libdir='', branch='', rsync=False): add_builder(c, 'mac_x86_64_10_6_scons', 'darwin-9.x.universal', generic_builder, hour=5) add_builder(c, 'mac_i386_10_6_scons', 'darwin-9.x.universal', generic_builder, hour=11) -add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder, hour=1) -add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder, hour=2) +#add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder, hour=1) +#add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder, hour=2) +add_builder(c, 'linux_glibc211_i386_cmake', '', generic_builder, hour=1) +add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2) #add_builder(c, 'win32_scons_vc2013', 'windows_vc12', generic_builder, hour=1) #add_builder(c, 'win64_scons_vc2013', 'win64_vc12', generic_builder, hour=2) add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=3) |