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:12 UTC
[31/31] git commit: Configuration Update for 3.1 and mail Changes to
test repos for 3.1 Mobilespec Changes for 3.1 plugman,
CLI Adds support for email notification
Configuration Update for 3.1 and mail Changes to test repos for 3.1 Mobilespec Changes for 3.1 plugman, CLI Adds support for email notification
Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/e09ed692
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/e09ed692
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/e09ed692
Branch: refs/heads/master
Commit: e09ed6927a86339a6003ba08948979c09926f52a
Parents: 963632c
Author: David Kemp <dr...@chromium.org>
Authored: Fri Oct 4 14:27:05 2013 -0400
Committer: David Kemp <dr...@chromium.org>
Committed: Tue Oct 15 14:15:05 2013 -0400
----------------------------------------------------------------------
config.json.sample | 6 ++++++
master.cfg | 33 ++++++++++++++++++++++++++++++---
repos.json | 16 +++++++++++-----
3 files changed, 47 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/e09ed692/config.json.sample
----------------------------------------------------------------------
diff --git a/config.json.sample b/config.json.sample
index f4b9342..ee7480e 100644
--- a/config.json.sample
+++ b/config.json.sample
@@ -35,5 +35,11 @@
"ios":{
"keychainPassword":"",
"keychainLocation":""
+ },
+ "mail":{
+ "to":["someone@someplace.com"],
+ "from":"yourbuildbot@yourEmailService.com",
+ "password":"yourSMTPpassword"
+ "serverURL":"put your external url here"
}
}
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/e09ed692/master.cfg
----------------------------------------------------------------------
diff --git a/master.cfg b/master.cfg
index 10ca392..ee74b30 100644
--- a/master.cfg
+++ b/master.cfg
@@ -32,6 +32,12 @@ build_ios=('ios' in platform_list)
projectbranches=['master',branch_release]
polltime=300
stabletime=30
+mail_to=[]
+for mt in json_config['mail']['to'] :
+ mail_to.append(str(mt))
+
+mail_from=str(json_config['mail']['from'])
+mail_pw=str(json_config['mail']['password'])
def getBranches(tags) :
result=[];
@@ -137,6 +143,9 @@ common_steps_1 = [
# The steps for any platform before platform add
common_steps_mobilespec_1 = [
ShellCommand(command=["npm","install"],workdir='build/cordova-cli',haltOnFailure=True,description='Install CLI',descriptionDone='Install CLI'),
+ ShellCommand(command=["rm","-rf","plugman"], workdir='build/cordova-cli/node_modules',haltOnFailure=True,description='Delete Plugman',descriptionDone='Delete Plugman'),
+ ShellCommand(command=["git","clone",repos['PLUGMAN'],"plugman"],workdir='build/cordova-cli/node_modules',haltOnFailure=True,description='Update Plugman',descriptionDone='Update Plugman'),
+ ShellCommand(command=["npm","install"], workdir='build/cordova-cli/node_modules/plugman',haltOnFailure=True,description='Delete Plugman',descriptionDone='Delete Plugman'),
ShellCommand(command=["./cordova-cli/bin/cordova","create","mobilespec","org.apache.mobilespec","mobilespec"],workdir='build',haltOnFailure=True, description='CLI Create', descriptionDone='CLI Create')
]
@@ -163,7 +172,7 @@ if(build_ios) :
factory_IOS.addStep(ShellCommand(command=["/bin/sh","-c","./cordova-coho/coho repo-clone -r plugins -r mobile-spec -r ios -r cli -r js "],workdir='build',haltOnFailure=True,description='COHO Clone', descriptionDone='COHO Clone'))
factory_IOS.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--releasebranch="+branch_release,"--release"],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master'))
factory_IOS.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM","--releasebranch="+branch_release,"--release"],workdir='build',haltOnFailure=False,description='Platform->release',descriptionDone='Platform->release'))
- factory_IOS.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=MSPEC","--releasebranch="+branch_release,"--release"],workdir='build',haltOnFailure=False,description='Mspec->release',descriptionDone='Mspec->release'))
+ factory_IOS.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=MSPEC","--releasebranch=master","--release"],workdir='build',haltOnFailure=False,description='Mspec->master',descriptionDone='Mspec->master'))
factory_IOS.addSteps(common_steps_mobilespec_1)
factory_IOS.addStep(ShellCommand(command=["node","medic/writejson.js","--branch="+branch_release],workdir='build',haltOnFailure=True, description='Write json',descriptionDone='Write json'))
factory_IOS.addStep(ShellCommand(command=["../cordova-cli/bin/cordova","platform","add","ios"],workdir='build/mobilespec',haltOnFailure=True,description='Platform Add',descriptionDone='Platform Add'))
@@ -178,7 +187,7 @@ if(build_android) :
factory_Android.addStep(ShellCommand(command=["/bin/sh","-c","./cordova-coho/coho repo-clone -r plugins -r mobile-spec -r android -r cli -r js "],workdir='build',haltOnFailure=True,description='COHO Clone', descriptionDone='COHO Clone'))
factory_Android.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--releasebranch="+branch_release,"--release"],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master'))
factory_Android.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM","--releasebranch="+branch_release,"--release"],workdir='build',haltOnFailure=False,description='Platform->release',descriptionDone='Platform->release'))
- factory_Android.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=MSPEC","--releasebranch="+branch_release,"--release"],workdir='build',haltOnFailure=False,description='Mspec->release',descriptionDone='Mspec->release'))
+ factory_Android.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=MSPEC","--releasebranch=master","--release"],workdir='build',haltOnFailure=False,description='Mspec->master',descriptionDone='Mspec->master'))
factory_Android.addSteps(common_steps_mobilespec_1)
factory_Android.addStep(ShellCommand(command=["node","medic/writejson.js","--branch="+branch_release],workdir='build',haltOnFailure=True, description='Write json',descriptionDone='Write json'))
factory_Android.addStep(ShellCommand(command=["../cordova-cli/bin/cordova","platform","add","android"],workdir='build/mobilespec',haltOnFailure=True,description='Platform Add',descriptionDone='Platform Add'))
@@ -230,6 +239,9 @@ c['status'] = []
from buildbot.status import html
from buildbot.status.web import authz, auth
+from buildbot.status import mail
+from buildbot.status.builder import Results
+from buildbot.status.mail import MailNotifier
authz_cfg=authz.Authz(
# change any of these to True to enable; see the manual for more
@@ -245,6 +257,21 @@ authz_cfg=authz.Authz(
)
c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
+
+mn1 = MailNotifier(
+ fromaddr=mail_from,
+ sendToInterestedUsers=False,
+ mode=('change',),
+ extraRecipients=mail_to,
+ relayhost='smtp.gmail.com',
+ smtpPort=587,
+ useTls=True,
+ smtpUser=mail_from,
+ smtpPassword=mail_pw,
+)
+
+c['status'].append(mn1)
+
####### PROJECT IDENTITY
# the 'title' string will appear at the top of this buildbot
@@ -260,7 +287,7 @@ c['titleURL'] = "http://cordova.apache.org"
# with an externally-visible host name which the buildbot cannot figure out
# without some help.
-c['buildbotURL'] = "http://localhost:8010/"
+c['buildbotURL'] = "http://172.23.188.139:8010/"
####### DB URL
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/e09ed692/repos.json
----------------------------------------------------------------------
diff --git a/repos.json b/repos.json
index 3ce5b61..dd97010 100644
--- a/repos.json
+++ b/repos.json
@@ -16,14 +16,14 @@
},
{
"title" : "Android Release Platform",
- "categories" : ["ANDROID","MSPEC"],
+ "categories" : ["ANDROID"],
"branch" : "RELEASE",
"builder": "Android_Release",
"platform": "android"
},
{
"title" : "Android Release Tools",
- "categories" : ["TOOLS","TESTMASTER"],
+ "categories" : ["TOOLS","TESTMASTER","MSPEC"],
"branch" : "master",
"builder": "Android_Release",
"platform": "android"
@@ -52,14 +52,14 @@
},
{
"title" : "IOS Release Platform",
- "categories" : ["IOS","MSPEC"],
+ "categories" : ["IOS"],
"branch" : "RELEASE",
"builder": "IOS_Release",
"platform": "ios"
},
{
"title" : "IOS Release Tools",
- "categories" : ["TOOLS","TESTMASTER"],
+ "categories" : ["TOOLS","TESTMASTER","MSPEC"],
"branch" : "master",
"builder": "IOS_Release",
"platform": "ios"
@@ -92,6 +92,12 @@
"category" : "TOOLS",
"release" : "master",
"current" :"master"
+},{
+ "title" : "PLUGMAN",
+ "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugman.git",
+ "category" : "TOOLS",
+ "release" : "master",
+ "current" :"master"
}
,
{
@@ -116,7 +122,7 @@
"title" : "MSPEC",
"repo" : "https://git-wip-us.apache.org/repos/asf/cordova-mobile-spec.git",
"category" : "MSPEC",
- "release" : "RELEASE",
+ "release" : "master",
"current" :"master"
}
,