From 1ab07c4803bc471accaa89383fba70bd18c4df17 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 25 Jul 2015 13:31:48 -0700 Subject: [PATCH] Move remaining OSX build (Py27) to the new VM. --- buildbot/master.cfg | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/buildbot/master.cfg b/buildbot/master.cfg index 211b6cc9..7ed90580 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -27,19 +27,19 @@ import bbpasswd reload(bbpasswd) from buildbot.buildslave import BuildSlave -c['slaves'] = [BuildSlave("osx-10.7-vm-py2.7", bbpasswd.PASSWD1, - notify_on_missing='robin@alldunn.com', - max_builds=1), +c['slaves'] = [#BuildSlave("osx-10.7-vm-py2.7", bbpasswd.PASSWD1, + # notify_on_missing='robin@alldunn.com', + # max_builds=1), BuildSlave("macosx-vm4", bbpasswd.PASSWD1, notify_on_missing='robin@alldunn.com', max_builds=1), - BuildSlave("win7-py27", bbpasswd.PASSWD1, + BuildSlave("win7-py27", bbpasswd.PASSWD1, notify_on_missing='robin@alldunn.com', max_builds=1), - BuildSlave("ubuntu-x64_86-py27", bbpasswd.PASSWD1, + BuildSlave("ubuntu-x64_86-py27", bbpasswd.PASSWD1, notify_on_missing='robin@alldunn.com', max_builds=1), @@ -94,7 +94,7 @@ c['schedulers'].append( SingleBranchScheduler( "build-win64-py27", "build-win64-py33", "build-win64-py34", - "build-osx-py27-2", + "build-osx-py27", "build-osx-py33", "build-osx-py34", "build-gtk-py27", @@ -107,7 +107,7 @@ c['schedulers'].append( Nightly( branch=phoenixGitBranch, hour=1, minute=15, onlyIfChanged=True, - builderNames=["dist-osx-py27-2", + builderNames=["dist-osx-py27", "dist-osx-py33", "dist-osx-py34", "dist-win32-py27", @@ -133,12 +133,12 @@ c['schedulers'].append( ForceScheduler( "build-win64-py27", "build-win64-py33", "build-win64-py34", - "build-osx-py27-2", + "build-osx-py27", "build-osx-py33", "build-osx-py34", "build-gtk-py27", "build-gtk-py33", - "dist-osx-py27-2", + "dist-osx-py27", "dist-osx-py33", "dist-osx-py34", "dist-win32-py27", @@ -228,8 +228,8 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'): c['builders'] = [ - BuilderConfig(name="build-osx-py27-2", - slavenames=["osx-10.7-vm-py2.7"], + BuilderConfig(name="build-osx-py27", + slavenames=["macosx-vm4"], factory=makeFactory('osx')), BuilderConfig(name="build-osx-py33", @@ -284,8 +284,8 @@ c['builders'] = [ - BuilderConfig(name="dist-osx-py27-2", - slavenames=["osx-10.7-vm-py2.7"], + BuilderConfig(name="dist-osx-py27", + slavenames=["macosx-vm4"], factory=makeFactory('osx', 'dist')), BuilderConfig(name="dist-osx-py33",