[146828] contrib/buildbot-test

[raimue at macports.org]

Revision: 146828
          https://trac.macports.org/changeset/146828
Author:   raimue at macports.org
Date:     2016-03-18 10:14:44 -0700 (Fri, 18 Mar 2016)
Log Message:
-----------
Add new configuration options for prefixes

slaveprefix is for which prefix packages should be built.
toolsprefix will be used for utilities, for example svn.

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 17:11:49 UTC (rev 146827)
+++ contrib/buildbot-test/config.json.sample	2016-03-18 17:14:44 UTC (rev 146828)
@@ -7,5 +7,7 @@
 	"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"
+	"archivesite":  "http://packages.macports.org",
+	"slaveprefix":  "/opt/local",
+	"toolsprefix":  "/opt/mports"
 }

Modified: contrib/buildbot-test/master.cfg
===================================================================
--- contrib/buildbot-test/master.cfg	2016-03-18 17:11:49 UTC (rev 146827)
+++ contrib/buildbot-test/master.cfg	2016-03-18 17:14:44 UTC (rev 146828)
@@ -28,12 +28,14 @@
 mpbbsvnurl   = "https://svn.macports.org/repository/macports/contrib/mp-buildbot"
 svnurl       = "https://svn.macports.org/repository/macports/trunk"
 archivesite  = "http://packages.macports.org"
+slaveprefix  = "/opt/local"
+toolsprefix  = "/opt/mports"
 
 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", "svnurl", "archivesite"]:
+    for key in ["production", "privkey", "slaveport", "httpport", "buildboturl", "htpasswdfile", "mpbbsvnurl", "svnurl", "archivesite", "slaveprefix", "toolsprefix"]:
         if configdata[key]:
             locals[key] = configdata[key]
 
@@ -216,21 +218,15 @@
             self.setProperty('fullportlist', ' '.join(portset))
 
 
-# can't run with PREFIX/SRC_PREFIX inside the workdir in production,
+# can't run with prefix inside the workdir in production,
 # because archives must be built with prefix=/opt/local
 if production:
     prefix='/opt/local'
-    src_prefix='/opt/mports'
     dlhost='packages at packages-origin.macports.org'
     dlpath='/var/www/html/packages'
 else:
-    prefix='/opt/local'
-    src_prefix='/opt/dports'
-    tools_prefix='/opt/mports'
+    prefix=slaveprefix
 
-    #prefix='%(workdir)s/opt/local'
-    #src_prefix='%(workdir)s/opt/mports'
-
     dlpath='./deployed_archives'
     dlhost=''
 
@@ -365,7 +361,7 @@
                 name="portbuilder-" + plat,
                 slavenames=["ports-" + plat],
                 factory=portbuilder_factory,
-                env={"PATH": tools_prefix + "/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"})]
+                env={"PATH": toolsprefix + "/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"})]
 
 ####### STATUS TARGETS
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160318/9cc421ef/attachment.html>