cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From drk...@apache.org
Subject git commit: added plugman,cli tests, ios release uses release mspec
Date Mon, 28 Oct 2013 14:38:44 GMT
Updated Branches:
  refs/heads/master 0f8005edb -> ad54c57a9


added plugman,cli tests, ios release uses release mspec


Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/ad54c57a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/ad54c57a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/ad54c57a

Branch: refs/heads/master
Commit: ad54c57a9ad6b14c9fbca80a4ed7e975ba1a5243
Parents: 0f8005e
Author: David Kemp <drkemp@chromium.org>
Authored: Mon Oct 28 10:37:50 2013 -0400
Committer: David Kemp <drkemp@chromium.org>
Committed: Mon Oct 28 10:37:50 2013 -0400

----------------------------------------------------------------------
 master.cfg | 36 +++++++++++++++++++++++++++++++-----
 repos.json | 29 ++++++++++++++++++++++-------
 2 files changed, 53 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/ad54c57a/master.cfg
----------------------------------------------------------------------
diff --git a/master.cfg b/master.cfg
index ee74b30..6cf3335 100644
--- a/master.cfg
+++ b/master.cfg
@@ -7,9 +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
+# from buildbot import manhole
 
-c['manhole']=manhole.PasswordManhole("tcp:1234:interface=127.0.0.1","admin","passwd")
+# 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. 
@@ -38,6 +38,7 @@ for mt in json_config['mail']['to'] :
 
 mail_from=str(json_config['mail']['from'])
 mail_pw=str(json_config['mail']['password'])
+mail_serverURL=str(json_config['mail']['serverURL'])
 
 def getBranches(tags) :
   result=[];
@@ -128,6 +129,23 @@ from buildbot.steps.source.git import Git
 from buildbot.steps.shell import ShellCommand
 from buildbot.config import BuilderConfig
 
+cli_steps = [
+    ShellCommand(command=["/bin/sh","-c","rm -rf cordova-*"],workdir='build',haltOnFailure=False,description='Cordova
Clean', descriptionDone='Cordova Clean'),
+    ShellCommand(command=["git","clone",repos['CLI'],"cordova-cli"],workdir='build',haltOnFailure=True,description='Get
CLI',descriptionDone='Get CLI'),
+    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='Install
Plugman',descriptionDone='Install Plugman'),
+    ShellCommand(command=["npm","test"], workdir='build/cordova-cli',haltOnFailure=True,description='Test
CLI',descriptionDone='Test CLI'),
+]
+
+plugman_steps = [
+    ShellCommand(command=["/bin/sh","-c","rm -rf cordova-*"],workdir='build',haltOnFailure=False,description='Cordova
Clean', descriptionDone='Cordova Clean'),
+    ShellCommand(command=["git","clone",repos['PLUGMAN'],"cordova-plugman"],workdir='build',haltOnFailure=True,description='Get
Plugman',descriptionDone='Get Plugman'),
+    ShellCommand(command=["npm","install"], workdir='build/cordova-plugman',haltOnFailure=True,description='Install
Plugman',descriptionDone='Install Plugman'),
+    ShellCommand(command=["npm","test"], workdir='build/cordova-plugman',haltOnFailure=True,description='Test
Plugman',descriptionDone='Test Plugman'),
+]
+
 # The steps that are required for any platform just to get tools and source in place
 common_steps_1 = [
     ShellCommand(command=["rm","-rf","medic"],workdir='build',haltOnFailure=False,description='Medic
Clean',descriptionDone='Medic Clean'),
@@ -172,7 +190,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=master","--release"],workdir='build',haltOnFailure=False,description='Mspec->master',descriptionDone='Mspec->master'))
+    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.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'))
@@ -187,7 +205,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=master","--release"],workdir='build',haltOnFailure=False,description='Mspec->master',descriptionDone='Mspec->master'))
+    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.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'))
@@ -228,6 +246,14 @@ if(build_android) :
     factory_Android_master.addStep(ShellCommand(command=["node", "medic/build_android.js"],
workdir='build', timeout=600,description='Deploy Android',descriptionDone='Deploy Android',name='Deploy
Android'))
     c['builders'].append(BuilderConfig(name="Android_Master",slavenames=["android-slave"],factory=factory_Android_master))
 
+factory_cli = BuildFactory()
+factory_cli.addSteps(cli_steps)
+c['builders'].append(BuilderConfig(name="Tools_CLI",slavenames=["common-slave"],factory=factory_cli))
+
+factory_plugman = BuildFactory()
+factory_plugman.addSteps(plugman_steps)
+c['builders'].append(BuilderConfig(name="Tools_Plugman",slavenames=["common-slave"],factory=factory_plugman))
+
 
 ####### STATUS TARGETS
 
@@ -287,7 +313,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://172.23.188.139:8010/"
+c['buildbotURL'] = mail_serverURL
 
 ####### DB URL
 

http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/ad54c57a/repos.json
----------------------------------------------------------------------
diff --git a/repos.json b/repos.json
index 9793e34..ae50b70 100644
--- a/repos.json
+++ b/repos.json
@@ -2,7 +2,7 @@
 "tests" : [
   {
     "title" : "Android Master Platform",
-    "categories" : ["ANDROID","TOOLS","MSPEC","TESTMASTER","JS"],
+    "categories" : ["ANDROID","CLI","PLUGMAN","COHO","MSPEC","TESTMASTER","JS"],
     "branch" : "master",
     "builder": "Android_Master",
     "platform": "android"
@@ -23,7 +23,7 @@
   },
   {
     "title" : "Android Release Tools",
-    "categories" : ["TOOLS","TESTMASTER","MSPEC"],
+    "categories" : ["CLI","PLUGMAN","COHO","TESTMASTER","MSPEC"],
     "branch" : "master",
     "builder": "Android_Release",
     "platform": "android"
@@ -38,7 +38,7 @@
 ,
   {
     "title" : "IOS Master Platform",
-    "categories" : ["IOS","TOOLS","MSPEC","TESTMASTER","JS"],
+    "categories" : ["IOS","CLI","PLUGMAN","COHO","MSPEC","TESTMASTER","JS"],
     "branch" : "master",
     "builder": "IOS_Master",
     "platform": "ios"
@@ -59,7 +59,7 @@
   },
   {
     "title" : "IOS Release Tools",
-    "categories" : ["TOOLS","TESTMASTER","MSPEC"],
+    "categories" : ["CLI","PLUGMAN","COHO","TESTMASTER","MSPEC"],
     "branch" : "master",
     "builder": "IOS_Release",
     "platform": "ios"
@@ -71,6 +71,21 @@
     "builder": "IOS_Release",
     "platform": "ios"
   }
+,
+  {
+    "title" : "CLI tooling tests",
+    "categories" : ["CLI","PLUGMAN"],
+    "branch" : "master",
+    "builder": "Tools_CLI",
+    "platform": "ios"
+  },
+  {
+    "title" : "Plugman tests",
+    "categories" : ["PLUGMAN"],
+    "branch" : "master",
+    "builder": "Tools_Plugman",
+    "platform": "ios"
+  }
 
 ],
 "repos" : [
@@ -83,19 +98,19 @@
 },{
     "title" : "COHO",
     "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-coho.git",
-    "category" : "TOOLS",
+    "category" : "COHO",
     "release" : "master",
     "current" : "master"
 },{
     "title" : "CLI",
     "repo"  : "https://git-wip-us.apache.org/repos/asf/cordova-cli.git",
-    "category" : "TOOLS",
+    "category" : "CLI",
     "release" : "master",
     "current" :"master"
 },{
     "title" : "PLUGMAN",
     "repo"  : "https://git-wip-us.apache.org/repos/asf/cordova-plugman.git",
-    "category" : "TOOLS",
+    "category" : "PLUGMAN",
     "release" : "master",
     "current" :"master"
 }


Mime
View raw message