Updated Branches: refs/heads/master 303c1bb4a -> 90367aefe
Made minor fixes to default files. Removed two extraneous steps for mobile Chrome tests. Added a missing comma to the sample config.json file. Also removed trailing whitespace. Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/90367aef Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/90367aef Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/90367aef Branch: refs/heads/master Commit: 90367aefe7daf36066e5e36b0eb16132de88b491 Parents: 303c1bb Author: Max Woghiren <[email protected]> Authored: Fri Feb 14 13:57:33 2014 -0500 Committer: Max Woghiren <[email protected]> Committed: Fri Feb 14 13:57:33 2014 -0500 ---------------------------------------------------------------------- config.json.sample | 2 +- master.cfg | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/90367aef/config.json.sample ---------------------------------------------------------------------- diff --git a/config.json.sample b/config.json.sample index ee7480e..c563627 100644 --- a/config.json.sample +++ b/config.json.sample @@ -39,7 +39,7 @@ "mail":{ "to":["[email protected]"], "from":"[email protected]", - "password":"yourSMTPpassword" + "password":"yourSMTPpassword", "serverURL":"put your external url here" } } http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/90367aef/master.cfg ---------------------------------------------------------------------- diff --git a/master.cfg b/master.cfg index d85b2bc..24c1a82 100644 --- a/master.cfg +++ b/master.cfg @@ -11,7 +11,7 @@ from twisted.python import log c = BuildmasterConfig = {} # from buildbot import manhole -# Manhole permits to ssh into the buildbot master process and examine the global variables. +# Manhole permits to ssh into the buildbot master process and examine the global variables. # Temporary disable it since there known issues with manhole on Windows platform so buildbot can't launch master # c['manhole']=manhole.PasswordManhole("tcp:1234:interface=127.0.0.1","admin","passwd") @@ -21,7 +21,7 @@ log.msg("Platform is %s" % (platform.system(),)) is_Windows=platform.system() == "Windows" # the 'change_source' setting tells the buildmaster how it should find out -# about source code changes. +# about source code changes. from buildbot.changes.gitpoller import GitPoller c['change_source'] = [] @@ -73,10 +73,10 @@ from buildbot.buildslave import BuildSlave from buildbot.changes import pb c['slaves'] = [ - BuildSlave("ios-slave", "pass",max_builds=1), - BuildSlave("android-slave", "pass",max_builds=1), - BuildSlave("windows-slave", "pass",max_builds=2), - BuildSlave("common-slave","pass",max_builds=3) + BuildSlave("ios-slave", "pass", max_builds=1), + BuildSlave("android-slave", "pass", max_builds=1), + BuildSlave("windows-slave", "pass", max_builds=2), + BuildSlave("common-slave", "pass", max_builds=3) ] # 'slavePortnum' defines the TCP port to listen on for connections from slaves. @@ -333,7 +333,7 @@ if(build_windows8) : factory_windows8.addStep(ShellCommand(command=["node", "medic/build_windows8.js"], workdir='build', timeout=600,description='Deploy Windows 8',descriptionDone='Deploy Windows8',name='Deploy Windows 8')) c['builders'].append(BuilderConfig(name="Windows8_Master",slavenames=["windows-slave"], factory=factory_windows8)) - + # TODO. temporary disable separate cli and plugman tests on Windows if not is_Windows : factory_cli = BuildFactory() @@ -361,8 +361,6 @@ if build_chrome : factory_chrome_mobile.addStep(ShellCommand(command=[shellCmd,shellRunParam,"git clone -b " + branches['TESTMASTER'] + " " + repos['TESTMASTER']+" medic"],workdir='build',haltOnFailure=True, description='Get Medic', descriptionDone='Get Medic')) # --production switch is used to speed up installation + fruitstrap dev dependency is not supported on Windows factory_chrome_mobile.addStep(ShellCommand(command=["npm","install","--production"], workdir='build/medic',haltOnFailure=True,description='Install Medic',descriptionDone='Install Medic')) - factory_chrome_mobile.addStep(ShellCommand(command=["rm","-rf","chrome-apps-api-tests"],workdir='build',haltOnFailure=True, description='Clean Chromespec',descriptionDone='Clean Chromespec')) - factory_chrome_mobile.addStep(ShellCommand(command=["git","clone",repos['CHROMESPEC']],workdir='build',haltOnFailure=True, description='Fetch Chromespec',descriptionDone='Fetch Chromespec')) factory_chrome_mobile.addStep(ShellCommand(command=["npm","install"],workdir='build/medic/runner',haltOnFailure=True, description='Install Runner',descriptionDone='Install Runner')) factory_chrome_mobile.addStep(ShellCommand(command=["rm","-rf","mobile-chrome-apps"],workdir='build',haltOnFailure=True, description='Clean cca',descriptionDone='Clean cca'))
