You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by dr...@apache.org on 2013/10/15 20:40:09 UTC
[28/31] git commit: category list must not have str()
category list must not have str()
Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/4c72ce82
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/4c72ce82
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/4c72ce82
Branch: refs/heads/master
Commit: 4c72ce82555ca51251137bcfde464651d56b1541
Parents: ea9e167
Author: David Kemp <dr...@google.com>
Authored: Thu Sep 5 16:56:07 2013 -0400
Committer: David Kemp <dr...@chromium.org>
Committed: Tue Oct 15 14:14:26 2013 -0400
----------------------------------------------------------------------
master.cfg | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/4c72ce82/master.cfg
----------------------------------------------------------------------
diff --git a/master.cfg b/master.cfg
index be25974..10ca392 100644
--- a/master.cfg
+++ b/master.cfg
@@ -7,6 +7,9 @@
# This is the dictionary that the buildmaster pays attention to. We also use
# a shorter alias to save typing.
c = BuildmasterConfig = {}
+from buildbot import manhole
+
+c['manhole']=manhole.PasswordManhole("tcp:1234:interface=127.0.0.1","admin","passwd")
# the 'change_source' setting tells the buildmaster how it should find out
# about source code changes.
@@ -22,7 +25,7 @@ with open("../repos.json") as f:
json_repos=json.load(f)
platform_list=json_config['app']['platforms']
-branch_release =json_config['app']['release']
+branch_release =str(json_config['app']['release'])
build_android=('android' in platform_list)
build_ios=('ios' in platform_list)
@@ -36,7 +39,7 @@ def getBranches(tags) :
if(b == 'RELEASE') :
result.append(branch_release)
else :
- result.append(b)
+ result.append(str(b))
return result
@@ -45,6 +48,7 @@ def getBranches(tags) :
# a BuildSlave object, specifying a unique slave name and password. The same
# slave name and password must be configured on the slave.
from buildbot.buildslave import BuildSlave
+from buildbot.changes import pb
c['slaves'] = [
BuildSlave("ios-slave", "pass",max_builds=1),
@@ -78,6 +82,8 @@ for jrepo in json_repos['repos'] :
if(build_ios and title=="IOS") :
c['change_source'].append(GitPoller(repo_url,project=title,category='PLATFORM', branches=getBranches([jrepo['release'],jrepo['current']]), pollinterval=polltime))
+c['change_source'].append(pb.PBChangeSource(port=9999,user='Cordova',passwd='Cordova'))
+
####### SCHEDULERS
@@ -95,7 +101,7 @@ for test in json_repos['tests'] :
if test["platform"] in platform_list :
c['schedulers'].append(SingleBranchScheduler(
name=str(test["title"]),
- change_filter=filter.ChangeFilter(branch=test["branch"],project=str(test["categories"])),
+ change_filter=filter.ChangeFilter(branch=test["branch"],project=test["categories"]),
treeStableTimer=stabletime,
builderNames=[str(test["builder"])]))
force_builders.append(str(test["builder"]))