[146811] contrib/buildbot-test

[raimue at macports.org]

Revision: 146811
          https://trac.macports.org/changeset/146811
Author:   raimue at macports.org
Date:     2016-03-18 06:19:45 -0700 (Fri, 18 Mar 2016)
Log Message:
-----------
Remove references to test setup at mpm16

Make svnurl and archivesite configurable.

Modified Paths:
--------------
    contrib/buildbot-test/config.json.sample
    contrib/buildbot-test/master.cfg

Modified: contrib/buildbot-test/config.json.sample
===================================================================
--- contrib/buildbot-test/config.json.sample	2016-03-18 12:58:23 UTC (rev 146810)
+++ contrib/buildbot-test/config.json.sample	2016-03-18 13:19:45 UTC (rev 146811)
@@ -6,4 +6,6 @@
 	"buildboturl":  "http://localhost:8010/",
 	"htpasswdfile": "htpasswd",
 	"mpbbsvnurl":   "https://svn.macports.org/repository/macports/contrib/mp-buildbot"
+	"svnurl":       "https://svn.macports.org/repository/macports"
+	"archivesite":  "http://packages.macports.org"
 }

Modified: contrib/buildbot-test/master.cfg
===================================================================
--- contrib/buildbot-test/master.cfg	2016-03-18 12:58:23 UTC (rev 146810)
+++ contrib/buildbot-test/master.cfg	2016-03-18 13:19:45 UTC (rev 146811)
@@ -26,12 +26,14 @@
 buildboturl  = "http://localhost:8010/"
 htpasswdfile = "htpasswd"
 mpbbsvnurl   = "https://svn.macports.org/repository/macports/contrib/mp-buildbot"
+svnurl       = "https://svn.macports.org/repository/macports/trunk"
+archivesite  = "http://packages.macports.org"
 
 if os.path.exists(_path('config.json')):
     with open(_path('config.json')) as f:
         configdata = json.load(f)
     locals = locals()
-    for key in ["production", "privkey", "slaveport", "httpport", "buildboturl", "htpasswdfile", "mpbbsvnurl"]:
+    for key in ["production", "privkey", "slaveport", "httpport", "buildboturl", "htpasswdfile", "mpbbsvnurl", "svnurl", "archivesite"]:
         if configdata[key]:
             locals[key] = configdata[key]
 
@@ -276,14 +278,14 @@
 portbuilder_factory.addStep(SVN(repourl=mpbbsvnurl,alwaysUseLatest=True,preferLastChangedRev=True,mode="incremental",workdir="build/mpbb",haltOnFailure=True))
 portbuilder_factory.addStep(ShellCommand(command=['./mpbb/mpbb', 'selfupdate', '--prefix', WithProperties(prefix)],haltOnFailure=True,
                                          name="selfupdate", description="selfupdate"))
-portbuilder_factory.addStep(ShellCommand(command=['./mpbb/mpbb', 'checkout', '--prefix', WithProperties(prefix), '--svn-url', 'http://linux.mpm16/svn-test/trunk'],
+portbuilder_factory.addStep(ShellCommand(command=['./mpbb/mpbb', 'checkout', '--prefix', WithProperties(prefix), '--svn-url', svnurl],
                                          timeout=3600,haltOnFailure=True,
                                          name="checkout", description="checkout"))
 portbuilder_factory.addStep(ShellCommand(command=['./mpbb/mpbb', 'install-dependencies', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portlist)s')],haltOnFailure=True,
                                          name="install-dependencies", description="install-dependencies"))
 portbuilder_factory.addStep(ShellCommand(command=['./mpbb/mpbb', 'install-port', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portlist)s')],haltOnFailure=True,
                                          name="install-port", description="install-port"))
-portbuilder_factory.addStep(ShellCommand(command=['./mpbb/mpbb', 'gather-archives', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portlist)s'), '--archive-site', 'http://linux.mpm16/packages', '--staging-dir', ulpath],haltOnFailure=True,
+portbuilder_factory.addStep(ShellCommand(command=['./mpbb/mpbb', 'gather-archives', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portlist)s'), '--archive-site', archivesite, '--staging-dir', ulpath],haltOnFailure=True,
                                          name="gather-archives", description="gather-archives"))
 
 # upload archives from build slave to master
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160318/4edd1aec/attachment.html>