[146810] contrib/buildbot-test
mojca at macports.org
mojca at macports.org
Fri Mar 18 05:58:23 PDT 2016
Revision: 146810
https://trac.macports.org/changeset/146810
Author: mojca at macports.org
Date: 2016-03-18 05:58:23 -0700 (Fri, 18 Mar 2016)
Log Message:
-----------
buildbot-test: mostly whitespace changes and commas
Modified Paths:
--------------
contrib/buildbot-test/master.cfg
contrib/buildbot-test/slaves.json.sample
Modified: contrib/buildbot-test/master.cfg
===================================================================
--- contrib/buildbot-test/master.cfg 2016-03-18 12:16:24 UTC (rev 146809)
+++ contrib/buildbot-test/master.cfg 2016-03-18 12:58:23 UTC (rev 146810)
@@ -5,7 +5,6 @@
import json
import os
-
def _path(name):
return os.path.join(os.path.dirname(__file__), name)
@@ -20,29 +19,25 @@
# (where /opt/local shouldn't be messed with) and the production server (where
# it has to be)
-production = False
-privkey = ''
-slaveport = 9989
-httpport = 8010
-buildboturl = "http://localhost:8010/"
+production = False
+privkey = ''
+slaveport = 9989
+httpport = 8010
+buildboturl = "http://localhost:8010/"
htpasswdfile = "htpasswd"
-mpbbsvnurl = "https://svn.macports.org/repository/macports/contrib/mp-buildbot"
+mpbbsvnurl = "https://svn.macports.org/repository/macports/contrib/mp-buildbot"
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"]:
- if configdata[key]:
- locals[key] = configdata[key]
+ locals = locals()
+ for key in ["production", "privkey", "slaveport", "httpport", "buildboturl", "htpasswdfile", "mpbbsvnurl"]:
+ if configdata[key]:
+ locals[key] = configdata[key]
-# platforms we are building for
-if production:
- # this list should get longer in future
- #build_platforms = ["snowleopard-x86_64", "lion-x86_64", "mtln-x86_64", "mavericks-x86_64", "yosemite-x86_64", "elcapitan-x86_64", "oelinux-6.3-x86_64"]
- build_platforms = []
-else:
- build_platforms = ["10.6-x86_64","10.9-x86_64"]
+# TODO: the following list should be configured in slaves.json
+build_platforms = ["10.6-x86_64"]
+#build_platforms = ["snowleopard-x86_64", "lion-x86_64", "mtln-x86_64", "mavericks-x86_64", "yosemite-x86_64", "elcapitan-x86_64", "oelinux-6.3-x86_64"]
# Allow spaces and tabs in property values
import re
@@ -80,6 +75,7 @@
# notifications from a post-commit script) should be used in production
if production:
+ # TODO
from buildbot.changes.pb import PBChangeSource
sourcedata = []
# with open(_path('source.json')) as f:
@@ -88,14 +84,12 @@
else:
from buildbot.changes.svnpoller import SVNPoller
c['change_source'] = (SVNPoller(
- svnurl='https://svn.macports.org/repository/macports/trunk',
- #'https://svn.macports.org/repository/macports/trunk',
- #svnbin='/opt/local/bin/svn',
- pollinterval=300,
- category='macports',
- project='ports',
- ),
- )
+ svnurl='https://svn.macports.org/repository/macports/trunk',
+ #'https://svn.macports.org/repository/macports/trunk',
+ #svnbin='/opt/local/bin/svn',
+ pollinterval=300,
+ category='macports',
+ project='ports'))
####### SCHEDULERS
@@ -298,12 +292,12 @@
# XXX: move deploy_archives.sh functionality to mp-buildbot
# sign generated binaries and sync to download server (if distributable)
#if production:
- #portbuilder_factory.addStep(MasterShellCommand(command=["./deploy_archives.sh", WithProperties(ulpath_unique)],
- # name="deploy archives",
- # description="deploy archives",
- # env={'PRIVKEY': privkey,
- # 'DLHOST': dlhost,
- # 'DLPATH': dlpath}))
+# portbuilder_factory.addStep(MasterShellCommand(command=["./deploy_archives.sh", WithProperties(ulpath_unique)],
+# name="deploy archives",
+# description="deploy archives",
+# env={'PRIVKEY': privkey,
+# 'DLHOST': dlhost,
+# 'DLPATH': dlpath}))
# TODO: do we want to upload the individual logs so maintainers can review them?
#ports_factory.addStep(ShellCommand(command="./cleanup_old.sh",
@@ -332,19 +326,23 @@
c['builders']=[]
for plat in build_platforms:
- c['builders']+= [BuilderConfig(name="base-"+plat,
- slavenames=["base-"+plat],
- factory=base_factory,
- env={"PATH": "/usr/bin:/bin:/usr/sbin:/sbin"})]
- if 'linux' not in plat:
- c['builders']+= [BuilderConfig(name="portwatcher-"+plat,
- slavenames=[plat],
- factory=make_portwatcher_factory("triggerable-portbuilder-"+plat),
- env={"PATH": "/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"})]
- c['builders']+= [BuilderConfig(name="portbuilder-"+plat,
- slavenames=[plat],
- factory=portbuilder_factory,
- env={"PATH": tools_prefix+"/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"})]
+ c['builders'] += [BuilderConfig(
+ name="base-" + plat,
+ slavenames=["base-" + plat],
+ factory=base_factory,
+ env={"PATH": "/usr/bin:/bin:/usr/sbin:/sbin"})]
+ if 'linux' not in plat:
+ c['builders'] += [
+ BuilderConfig(
+ name="portwatcher-" + plat,
+ slavenames=[plat],
+ factory=make_portwatcher_factory("triggerable-portbuilder-" + plat),
+ env={"PATH": "/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"}),
+ BuilderConfig(
+ name="portbuilder-" + plat,
+ slavenames=[plat],
+ factory=portbuilder_factory,
+ env={"PATH": tools_prefix + "/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"})]
####### STATUS TARGETS
@@ -392,7 +390,7 @@
failedPorts = set()
interestedUsers = set()
- # XXX: needs to be rewritten for the new steps of mp-buildbot
+ # XXX: needs to be rewritten for the new steps of mp-buildbot
statusStep = [x for x in build.getSteps() if x.getName() == "status"][0]
statusLog = [x for x in statusStep.getLogs() if x.getName() == "portstatus"][0]
for line in statusLog.getText().splitlines():
@@ -443,11 +441,6 @@
####### DB URL
-# This specifies what database buildbot uses to store change and scheduler
-# state. You can leave this at its default for all but the largest
-# installations.
-#c['db_url'] = "sqlite:///state.sqlite"
-
c['db'] = {
# This specifies what database buildbot uses to store its state. You can leave
# this at its default for all but the largest installations.
Modified: contrib/buildbot-test/slaves.json.sample
===================================================================
--- contrib/buildbot-test/slaves.json.sample 2016-03-18 12:16:24 UTC (rev 146809)
+++ contrib/buildbot-test/slaves.json.sample 2016-03-18 12:58:23 UTC (rev 146810)
@@ -1,4 +1,4 @@
{
"base-10.6-x86_64": "***",
- "10.6-x86_64": "***",
+ "10.6-x86_64": "***"
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160318/a3e29300/attachment-0001.html>
More information about the macports-changes
mailing list