From bc5ccab926f5c5a1413ebd6c719f74401eb0efa3 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 15 Dec 2016 14:16:43 -0800 Subject: [PATCH] Remove the vagrant builder for now, there are some issues that need to be dealt with but it may be easier to just do them by hand for now. --- buildbot/README.txt | 3 +-- buildbot/master.cfg | 32 ++++++++++++++++++-------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/buildbot/README.txt b/buildbot/README.txt index 5f26d36f..92d7e525 100644 --- a/buildbot/README.txt +++ b/buildbot/README.txt @@ -15,5 +15,4 @@ server with these commands: scp buildbot/master.cfg wxpybb@buildbot.wxpython.org:/home/wxpybb/buildbot ssh wxpybb@buildbot.wxpython.org "cd /home/wxpybb && ./reconfig" - - \ No newline at end of file + diff --git a/buildbot/master.cfg b/buildbot/master.cfg index 2f5d4ef7..15229b7c 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -47,9 +47,9 @@ c['slaves'] = [#BuildSlave("osx-10.7-vm-py2.7", bbpasswd.PASSWD1, # notify_on_missing='robin@alldunn.com', # max_builds=1), - BuildSlave('vagrant-bldr', bbpasswd.PASSWD1, - notify_on_missing='robin@alldunn.com', - max_builds=1), + #BuildSlave('vagrant-bldr', bbpasswd.PASSWD1, + # notify_on_missing='robin@alldunn.com', + # max_builds=1), ] # 'slavePortnum' defines the TCP port to listen on for connections from slaves. @@ -141,12 +141,12 @@ c['schedulers'].append( Nightly( onlyIfChanged=True, builderNames=["bdist-src"])) -c['schedulers'].append( Nightly( - name="sched-vagrant", - branch=phoenixGitBranch, - hour=1, minute=10, - onlyIfChanged=True, - builderNames=["vagrant-bldr"])) +# c['schedulers'].append( Nightly( +# name="sched-vagrant", +# branch=phoenixGitBranch, +# hour=1, minute=10, +# onlyIfChanged=True, +# builderNames=["vagrant-bldr"])) c['schedulers'].append( ForceScheduler( name='sched-force', @@ -176,7 +176,7 @@ c['schedulers'].append( ForceScheduler( "dist-win64-py35", "bdist-docs", "bdist-src", - "vagrant-bldr", + #"vagrant-bldr", ])) @@ -250,7 +250,11 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'): 'sphinx bdist_docs --upload' % pyVer elif buildType == 'vagrant': - cmd = 'python -u build.py setrev dox etg --nodoc sip sdist build_vagrant --upload' + # TODO: This will also upload the source tarfile, which is redundant + # since there is another job for that. Is there an easy way around + # that? + cmd = 'python -u build.py setrev dox etg --nodoc sip sdist ' \ + 'build_vagrant --upload' else: cmd = 'python -u build.py %s %s setrev dox touch etg --nodoc sip build' % (pyVer, clean) @@ -394,9 +398,9 @@ c['builders'] = [ factory=makeFactory('win64', 'dist', pyVer='3.5')), - BuilderConfig(name="vagrant-bldr", - slavenames=["vagrant-bldr"], - factory=makeFactory('osx', 'vagrant')), + # BuilderConfig(name="vagrant-bldr", + # slavenames=["vagrant-bldr"], + # factory=makeFactory('osx', 'vagrant')), ]