[146814] contrib/buildbot-test/master.cfg

[raimue at macports.org]

Revision: 146814
          https://trac.macports.org/changeset/146814
Author:   raimue at macports.org
Date:     2016-03-18 06:41:26 -0700 (Fri, 18 Mar 2016)
Log Message:
-----------
Rename portlist property for semantics

Keep the original 'portlist' property unchanged in order to be able to press
the "Force Build" button to reschedule the same build again. After overwriting
the property BuildBot no longer knew it was an input property.

Pass 'portname' to portbuilder to as just one single port will be build.

Modified Paths:
--------------
    contrib/buildbot-test/master.cfg

Modified: contrib/buildbot-test/master.cfg
===================================================================
--- contrib/buildbot-test/master.cfg	2016-03-18 13:33:51 UTC (rev 146813)
+++ contrib/buildbot-test/master.cfg	2016-03-18 13:41:26 UTC (rev 146814)
@@ -193,7 +193,7 @@
                 if len(comps) >= 3 and comps[0] == 'dports' and comps[1] != '_resources':
                     portset.add(comps[2])
 
-            self.setProperty('portlist', ' '.join(portset))
+            self.setProperty('fullportlist', ' '.join(portset))
 
 
 # can't run with PREFIX/SRC_PREFIX inside the workdir in production,
@@ -229,7 +229,7 @@
         sp = []
         for scheduler in self.schedulerNames:
             for port in self.build.getProperty("subportlist").split():
-                sp.append([scheduler,{"portlist": port}])
+                sp.append([scheduler,{"portname": port}])
         return sp
         
 
@@ -240,7 +240,7 @@
 	# get mp-buildbot; we'll do the checkout of base and dports via these scripts
 	portwatcher_factory.addStep(SVN(repourl=mpbbsvnurl,alwaysUseLatest=True,preferLastChangedRev=True,mode="incremental",workdir="build/mpbb",haltOnFailure=True))
 
-	portwatcher_factory.addStep(SetPropertyFromCommandWithPortlist(command=WithProperties('for portname in %(portlist)s; do for subport in `./mpbb/tools/subports.tcl $portname`; do echo $subport; done; done' ),
+	portwatcher_factory.addStep(SetPropertyFromCommandWithPortlist(command=WithProperties('for portname in %(fullportlist)s; do for subport in `./mpbb/tools/subports.tcl $portname`; do echo $subport; done; done' ),
 								       property="subportlist",
                                          			       name="subports", description="subports"))
 
@@ -273,8 +273,8 @@
 portbuilder_factory = BuildFactory()
 
 # XXX: use InfoStep instead of running a dummy command
-portbuilder_factory.addStep(ShellCommand(command=["/usr/bin/true"],descriptionDone=WithProperties("Port %(portlist)s")))
-#portbuilder_factory.addStep(InfoStep(title=WithProperties("Port %(portlist)s")))
+portbuilder_factory.addStep(ShellCommand(command=["/usr/bin/true"],descriptionDone=WithProperties("Port %(portname)s")))
+#portbuilder_factory.addStep(InfoStep(title=WithProperties("Port %(portname)s")))
 
 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,
@@ -282,11 +282,11 @@
 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,
+portbuilder_factory.addStep(ShellCommand(command=['./mpbb/mpbb', 'install-dependencies', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)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,
+portbuilder_factory.addStep(ShellCommand(command=['./mpbb/mpbb', 'install-port', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)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', archivesite, '--staging-dir', ulpath],haltOnFailure=True,
+portbuilder_factory.addStep(ShellCommand(command=['./mpbb/mpbb', 'gather-archives', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)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/a37386b4/attachment.html>