cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an-s...@apache.org
Subject [5/7] cordova-medic git commit: Renamed builders for consistency and avoiding conflicts
Date Wed, 14 Jan 2015 17:48:34 GMT
Renamed builders for consistency and avoiding conflicts


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

Branch: refs/heads/master
Commit: f66cfa57bbbc44f2d76a1c55b98219102ff33519
Parents: 64f62e6
Author: alsorokin <alexander.sorokin@akvelon.com>
Authored: Tue Jan 13 17:14:16 2015 +0300
Committer: alsorokin <alexander.sorokin@akvelon.com>
Committed: Tue Jan 13 17:14:16 2015 +0300

----------------------------------------------------------------------
 cordova-repos.json | 24 ++++++++++++------------
 cordova.conf       | 22 +++++++++++-----------
 2 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/f66cfa57/cordova-repos.json
----------------------------------------------------------------------
diff --git a/cordova-repos.json b/cordova-repos.json
index faa4433..cf38c5a 100644
--- a/cordova-repos.json
+++ b/cordova-repos.json
@@ -4,35 +4,35 @@
     "title" : "Android Master Platform",
     "categories" : ["CORDOVA-ANDROID","CORDOVA-CLI","CORDOVA-PLUGMAN","CORDOVA-COHO","CORDOVA-MSPEC","CORDOVA-TESTMASTER","CORDOVA-JS"],
     "branch" : "master",
-    "builder": "Android",
+    "builder": "cordova-android",
     "platform": "android"
   },
   {
     "title" : "Android Master Plugins",
     "categories" : ["CORDOVA-PLUGIN"],
     "branch" : "master",
-    "builder": "Android",
+    "builder": "cordova-android",
     "platform": "android"
   },
     {
     "title" : "Android Build Windows",
     "categories" : ["CORDOVA-ANDROID","CORDOVA-CLI","CORDOVA-PLUGIN","CORDOVA-COHO","CORDOVA-MSPEC","CORDOVA-TESTMASTER","CORDOVA-JS"],
     "branch" : "master",
-    "builder": "AndroidWin",
+    "builder": "cordova-android-win",
     "platform": "android"
   },
   {
     "title" : "IOS Master Platform",
     "categories" : ["CORDOVA-IOS","CORDOVA-CLI","CORDOVA-PLUGMAN","CORDOVA-COHO","CORDOVA-MSPEC","CORDOVA-TESTMASTER","CORDOVA-JS"],
     "branch" : "master",
-    "builder": "IOS",
+    "builder": "cordova-ios",
     "platform": "ios"
   },
   {
     "title" : "IOS Master Plugins",
     "categories" : ["CORDOVA-PLUGIN"],
     "branch" : "master",
-    "builder": "IOS",
+    "builder": "cordova-ios",
     "platform": "ios"
   }
 ,
@@ -40,14 +40,14 @@
     "title" : "Windows Phone8 master",
     "categories" : ["CORDOVA-WP8","CORDOVA-CLI","CORDOVA-PLUGIN","CORDOVA-COHO","CORDOVA-MSPEC","CORDOVA-TESTMASTER","CORDOVA-JS"],
     "branch" : "master",
-    "builder": ["WP8", "WP8_vs2012_win8"],
+    "builder": ["cordova-wp8", "cordova-wp8-vs2012-win8"],
     "platform": "wp8"
   },
   {
     "title" : "Windows 8 master",
     "categories" : ["CORDOVA-WINDOWS","CORDOVA-CLI","CORDOVA-PLUGIN","CORDOVA-COHO","CORDOVA-MSPEC","CORDOVA-TESTMASTER","CORDOVA-JS"],
     "branch" : "master",
-    "builder": ["Windows", "Windows8_vs2012_win8"],
+    "builder": ["cordova-windows", "cordova-windows8-vs2012-win8"],
     "platform": "windows"
   }
 ,
@@ -55,14 +55,14 @@
     "title" : "BlackBerry Master Platform",
     "categories" : ["CORDOVA-BLACKBERRY","CORDOVA-CLI","CORDOVA-PLUGMAN","CORDOVA-COHO","CORDOVA-MSPEC","CORDOVA-TESTMASTER","CORDOVA-JS"],
     "branch" : "master",
-    "builder": "BlackBerry",
+    "builder": "cordova-blackberry",
     "platform": "blackberry"
   },
   {
     "title" : "BlackBerry Master Plugins",
     "categories" : ["CORDOVA-PLUGIN"],
     "branch" : "master",
-    "builder": "BlackBerry",
+    "builder": "cordova-blackberry",
     "platform": "blackberry"
   }
 ,
@@ -70,21 +70,21 @@
     "title" : "CLI tooling tests",
     "categories" : ["CORDOVA-CLI","CORDOVA-LIB"],
     "branch" : "master",
-    "builder": "Tools_CLI",
+    "builder": "cordova-tools-cli",
     "platform": "ios"
   },
   {
     "title" : "ChromeSpec on Chrome",
     "categories" : ["CORDOVA-CHROMESPEC"],
     "branch" : "master",
-    "builder": "ZChrome_Desktop",
+    "builder": "cordova-zchrome_desktop",
     "platform": "chrome"
   },
   {
     "title" : "ChromeSpec on Android",
     "categories" : ["CORDOVA-CHROMESPEC"],
     "branch" : "master",
-    "builder": "ZChrome_Mobile",
+    "builder": "cordova-zchrome-mobile",
     "platform": "chrome"
   }
 ],

http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/f66cfa57/cordova.conf
----------------------------------------------------------------------
diff --git a/cordova.conf b/cordova.conf
index f8291c8..47e061a 100644
--- a/cordova.conf
+++ b/cordova.conf
@@ -245,22 +245,22 @@ class PlatformTestBlackberry(PlatformTestBase):
         return steps
 
 if CONFIG.has_platform("ios"):
-    c['builders'].append(BuilderConfig(name="IOS", slavenames=["cordova-ios-slave"], factory=PlatformTestIOS().get_default_factory()))
+    c['builders'].append(BuilderConfig(name="cordova-ios", slavenames=["cordova-ios-slave"],
factory=PlatformTestIOS().get_default_factory()))
 
 if CONFIG.has_platform("android"):
-    c['builders'].append(BuilderConfig(name="Android", slavenames=["cordova-android-slave"],
factory=PlatformTestAndroid().get_default_factory()))
-    c['builders'].append(BuilderConfig(name="AndroidWin", slavenames=["cordova-windows-slave"],
factory=PlatformTestAndroid().get_default_factory()))
+    c['builders'].append(BuilderConfig(name="cordova-android", slavenames=["cordova-android-slave"],
factory=PlatformTestAndroid().get_default_factory()))
+    c['builders'].append(BuilderConfig(name="cordova-android-win", slavenames=["cordova-windows-slave"],
factory=PlatformTestAndroid().get_default_factory()))
 
 if CONFIG.has_platform("wp8"):
-    c['builders'].append(BuilderConfig(name="WP8", slavenames=["cordova-windows-slave"],
factory=PlatformTestWP8().get_default_factory()))
-    c['builders'].append(BuilderConfig(name="WP8_vs2012_win8", slavenames=["cordova-win8-slave"],
factory=PlatformTestWP8().get_default_factory()))
+    c['builders'].append(BuilderConfig(name="cordova-wp8", slavenames=["cordova-windows-slave"],
factory=PlatformTestWP8().get_default_factory()))
+    c['builders'].append(BuilderConfig(name="cordova-wp8-vs2012-win8", slavenames=["cordova-win8-slave"],
factory=PlatformTestWP8().get_default_factory()))
 
 if CONFIG.has_platform("windows"):
-    c['builders'].append(BuilderConfig(name="Windows", slavenames=["cordova-windows-slave"],
factory=PlatformTestWindows().get_default_factory()))
-    c['builders'].append(BuilderConfig(name="Windows8_vs2012_win8", slavenames=["cordova-win8-slave"],
factory=PlatformTestWindows().get_default_factory()))
+    c['builders'].append(BuilderConfig(name="cordova-windows", slavenames=["cordova-windows-slave"],
factory=PlatformTestWindows().get_default_factory()))
+    c['builders'].append(BuilderConfig(name="cordova-windows8-vs2012-win8", slavenames=["cordova-win8-slave"],
factory=PlatformTestWindows().get_default_factory()))
 
 if CONFIG.has_platform("blackberry"):
-    c['builders'].append(BuilderConfig(name="BlackBerry", slavenames=["cordova-blackberry-slave"],
factory=PlatformTestBlackberry().get_default_factory()))
+    c['builders'].append(BuilderConfig(name="cordova-blackberry", slavenames=["cordova-blackberry-slave"],
factory=PlatformTestBlackberry().get_default_factory()))
 
 if CONFIG.has_platform("chrome"):
     factory_chrome_desktop = BuildFactory()
@@ -272,7 +272,7 @@ if CONFIG.has_platform("chrome"):
     factory_chrome_desktop.addStep(ShellCommand(command=["git", "clone", CONFIG.repos['CCA']],
workdir='build', haltOnFailure=True, description='Fetch Chromespec', descriptionDone='Fetch
Chromespec'))
     factory_chrome_desktop.addStep(ShellCommand(command=["npm", "install"], workdir='build/medic/runner',
haltOnFailure=True, description='Install Runner', descriptionDone='Install Runner'))
     factory_chrome_desktop.addStep(ShellCommand(command=["node", "medic/runner/testrunner.js",
"--cmd=medic/runner/runchrome.sh", "--path=mobile-chrome-apps/chrome-cordova/chrome-apps-api-tests",
"--args=mobile-chrome-apps/chrome-cordova/chrome-apps-api-tests"], workdir='build', haltOnFailure=True,
description='Run Chrome', descriptionDone='Run Chrome'))
-    c['builders'].append(BuilderConfig(name="ZChrome_Desktop", slavenames=["cordova-common-slave"],
factory=factory_chrome_desktop))
+    c['builders'].append(BuilderConfig(name="cordova-zchrome-desktop", slavenames=["cordova-common-slave"],
factory=factory_chrome_desktop))
 
     factory_chrome_mobile = BuildFactory()
     factory_chrome_mobile.addStep(ShellCommand(command=["rm", "-rf", "medic"], workdir='build',
haltOnFailure=False, description='Medic Clean', descriptionDone='Medic Clean'))
@@ -288,12 +288,12 @@ if CONFIG.has_platform("chrome"):
     factory_chrome_mobile.addStep(ShellCommand(command=["mobile-chrome-apps/src/cca.js",
"create", "ccatest", "--copy-from", "mobile-chrome-apps/chrome-cordova/chrome-apps-api-tests"],
workdir='build', haltOnFailure=True, description='cca create', descriptionDone='cca create'))
 
     factory_chrome_mobile.addStep(ShellCommand(command=["node", "../medic/runner/testrunner.js",
"--ip=192.168.1.122", "--port=6800", "--cmd=../medic/runner/runcca.sh", "--path=www", "--args=android"],
workdir='build/ccatest', timeout=300, haltOnFailure=True, description='Run Mobile', descriptionDone='Run
Mobile'))
-    c['builders'].append(BuilderConfig(name="ZChrome_Mobile", slavenames=["cordova-android-slave"],
factory=factory_chrome_mobile))
+    c['builders'].append(BuilderConfig(name="cordova-zchrome-mobile", slavenames=["cordova-android-slave"],
factory=factory_chrome_mobile))
 
 factory_cli = BuildFactory()
 factory_cli.addStep(ShellCommand(command=["rm","-rf","cordova-*"],workdir='build',haltOnFailure=False,description='Cordova
Clean'))
 factory_cli.addSteps(PlatformTestBase().cli_steps())
-c['builders'].append(BuilderConfig(name="Tools_CLI", slavenames=["cordova-common-slave"],
factory=factory_cli))
+c['builders'].append(BuilderConfig(name="cordova-tools-cli", slavenames=["cordova-common-slave"],
factory=factory_cli))
 
 # factory_plugman = BuildFactory()
 # factory_plugman.addSteps(PlatformTestBase().plugman_steps())


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message