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:39:58 UTC
[17/31] git commit: remove unused code, fix readme, fix release build
remove unused code, fix readme, fix release build
Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/b0f7e0fd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/b0f7e0fd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/b0f7e0fd
Branch: refs/heads/master
Commit: b0f7e0fd5c358798e750f30e41e89e191735e734
Parents: 6488152
Author: David Kemp <dr...@google.com>
Authored: Mon Aug 26 14:06:38 2013 -0400
Committer: David Kemp <dr...@chromium.org>
Committed: Tue Oct 15 14:12:27 2013 -0400
----------------------------------------------------------------------
README.md | 26 ++++++++++++++------------
cordova_config.json | 16 ----------------
libraries.js | 31 -------------------------------
master.cfg | 18 ++++++++----------
4 files changed, 22 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/b0f7e0fd/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 408485b..8c546e8 100644
--- a/README.md
+++ b/README.md
@@ -22,18 +22,17 @@
- get the sample running
- stop the slave and the master
- add slaves:
- - buildslave create-slave slave_common localhost:9889 common-slave pass
- buildslave create-slave slave_ios localhost:9889 ios-slave pass
- buildslave create-slave slave_android localhost:9889 android-slave pass
-- get two files from the medic repository
+- get three files from the medic repository
- master.cfg - copy to buildbot/master/master.cfg
- - config.json.sample - copy to buildbot, then edit for local ip, test platforms, ios keychain, current release build
+ - config.json.sample - copy to the buildbot base directory, then edit for local ip, test platforms, ios keychain, current release build
+ - repos.json - copy to the buildbot base directory
#Running the System
- start the master with buildbot start master
- start the slaves with:
- - buildslave start slave_common
- buildslave start slave_ios
- buildslave start slave_android
- point your browser at http://localhost:8010/waterfall to see the buildbot state
@@ -45,9 +44,9 @@
- force a test by clicking on the test link at the top of the buildbot display and then 'force build'
#Configuring
-- all changes for a local install should only require edits to config.json
-- new platforms, test procedures, build steps, etc in master.cfg which should still be global
-- whenever config.json or master.cfg changes, you need to restart the master (not slaves)
+- all changes for a local install should only require edits to config.json in the buildbot base directory
+- new platforms, test procedures, build steps, etc require edits to master.cfg and repos.json which should still be global (all platforms)
+- whenever config.json, repos.json or master.cfg changes, you need to restart the master (not slaves)
#Overview
Buildbot polls all the repositories every few minutes to look for changes. Whenever a change is detected, those changes trigger one or more build requests.
@@ -61,17 +60,20 @@ At the start of each test run, the collection of components (git repositories) a
The DB ref from this document is used as the SHA for the test and is what is recorded in mobilespec_results or build_errors
The various test runners are configured to report a fail/pass by device and the buildbot display will report FAIL if any test on any device fails.
+every command has a link to its output o the main display. When a mobile spec test completes, there is a link to the test result written to the output log.
#Current Test Configuration
-- three slaves are configured (Android, iOS and common) Android and iOS wil only run a single test at a time.
+- Two slaves are configured (Android and iOS) Android and iOS wil only run a single test at a time.
- Tools (Coho, CLI, test system) always build from the master branch
- Changes to tooling or the test scripts will trigger all tests.
+
- Android tests:
- - master branch using cordova-js from master
- - 3.0.x branch with the embedded cordova-js
+ - platform, mobilespec and js from master branch, plugins from dev branch (cordova-js is built and copied in)
+ - platform and mobilspec 3.0.x branch with the cordova-js embedded in the cordova-android repo, plugins from master
+
- iOS tests:
- - master branch using cordova-js from master
- - 3.0.x branch with the embedded cordova-js
+ - platform, mobilespec and js from master branch, plugins from dev branch (cordova-js is built and copied in)
+ - platform and mobilspec 3.0.x branch with the cordova-js embedded in the cordova-ios repo, plugins from master
The tests use COHO and CLI for as much as possible to ensure that the developer tool chain is working.
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/b0f7e0fd/cordova_config.json
----------------------------------------------------------------------
diff --git a/cordova_config.json b/cordova_config.json
deleted file mode 100644
index 5b9ed41..0000000
--- a/cordova_config.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "id":"org.apache.mobilespec",
- "name":"mobilespec",
- "lib": {
- "android": {
- "uri": "/Users/drkemp/sandbox/cordova-android",
- "version": "dev",
- "id": "cordova-android-dev"
- },
- "ios": {
- "uri": "/Users/drkemp/sandbox/cordova-ios",
- "version": "dev",
- "id": "cordova-ios-dev"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/b0f7e0fd/libraries.js
----------------------------------------------------------------------
diff --git a/libraries.js b/libraries.js
deleted file mode 100644
index d22f5b2..0000000
--- a/libraries.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-var path = require('path');
-
-module.exports = {
- list:['android','blackberry','ios'],
- paths:{
- 'cordova-android':path.join(__dirname, 'lib', 'cordova-android'),
- 'cordova-ios':path.join(__dirname, 'lib', 'cordova-ios'),
- 'test':path.join(__dirname, 'lib', 'test')
- },
- output:{
- 'cordova-android':path.join(__dirname, 'temp', 'android'),
- 'cordova-ios':path.join(__dirname, 'temp', 'ios'),
- 'test':path.join(__dirname, 'temp', 'test')
- }
-};
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/b0f7e0fd/master.cfg
----------------------------------------------------------------------
diff --git a/master.cfg b/master.cfg
index 3ea13a6..a14b428 100644
--- a/master.cfg
+++ b/master.cfg
@@ -152,15 +152,13 @@ common_steps_js = [
c['builders'] = []
-pb = "checkout.js --path=../../../repos.json" # --cat=PLUGIN
-
if(build_ios) :
factory_IOS = BuildFactory()
factory_IOS.addStep(ShellCommand(command=["/bin/sh","-c","rm -rf ~/.cordova/lib/ios"],workdir='build',haltOnFailure=False,description='Remove cache',descriptionDone='Remove cache'))
factory_IOS.addSteps(common_steps_1)
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","--branch=master"],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master'))
- factory_IOS.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM","--branch="+branch_release],workdir='build',haltOnFailure=False,description='Platform->release',descriptionDone='Platform->release'))
+ factory_IOS.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--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","--release"],workdir='build',haltOnFailure=False,description='Platform->release',descriptionDone='Platform->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'))
@@ -173,8 +171,8 @@ if(build_android) :
factory_Android.addStep(ShellCommand(command=["/bin/sh","-c","rm -rf ~/.cordova/lib/android"],workdir='build',haltOnFailure=False,description='Remove cache',descriptionDone='Remove cache'))
factory_Android.addSteps(common_steps_1)
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","--branch=master"],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master'))
- factory_Android.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM","--branch="+branch_release],workdir='build',haltOnFailure=False,description='Platform->release',descriptionDone='Platform->release'))
+ factory_Android.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--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","--release"],workdir='build',haltOnFailure=False,description='Platform->release',descriptionDone='Platform->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'))
@@ -187,8 +185,8 @@ if(build_ios) :
factory_IOS_master.addStep(ShellCommand(command=["/bin/sh","-c","rm -rf ~/.cordova/lib/ios"],workdir='build',haltOnFailure=False,description='Remove cache',descriptionDone='Remove cache'))
factory_IOS_master.addSteps(common_steps_1)
factory_IOS_master.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_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--branch=dev"],workdir='build',haltOnFailure=False,description='Plugins->dev',descriptionDone='Plugins->dev'))
- factory_IOS_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM","--branch=master"],workdir='build',haltOnFailure=False,description='Platform->master',descriptionDone='Platform->master'))
+ factory_IOS_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN"],workdir='build',haltOnFailure=False,description='Plugins->dev',descriptionDone='Plugins->dev'))
+ factory_IOS_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM"],workdir='build',haltOnFailure=False,description='Platform->master',descriptionDone='Platform->master'))
factory_IOS_master.addSteps(common_steps_mobilespec_1)
factory_IOS_master.addStep(ShellCommand(command=["node","medic/writejson.js","--branch=master"],workdir='build',haltOnFailure=True, description='Write json',descriptionDone='Write json'))
factory_IOS_master.addStep(ShellCommand(command=["../cordova-cli/bin/cordova","platform","add","ios"],workdir='build/mobilespec',haltOnFailure=True, description='Platform Add',descriptionDone='Platform Add'))
@@ -203,8 +201,8 @@ if(build_android) :
factory_Android_master.addStep(ShellCommand(command=["/bin/sh","-c","rm -rf ~/.cordova/lib/android"],workdir='build',haltOnFailure=False,description='Remove cache',descriptionDone='Remove cache'))
factory_Android_master.addSteps(common_steps_1)
factory_Android_master.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_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--branch=dev"],workdir='build',haltOnFailure=False,description='Plugins->dev',descriptionDone='Plugins->dev'))
- factory_Android_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM","--branch=master"],workdir='build',haltOnFailure=False,description='Platform->master',descriptionDone='Platform->master'))
+ factory_Android_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN"],workdir='build',haltOnFailure=False,description='Plugins->dev',descriptionDone='Plugins->dev'))
+ factory_Android_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM"],workdir='build',haltOnFailure=False,description='Platform->master',descriptionDone='Platform->master'))
factory_Android_master.addSteps(common_steps_mobilespec_1)
factory_Android_master.addStep(ShellCommand(command=["node","medic/writejson.js","--branch=master"],workdir='build',haltOnFailure=True, description='Write json',descriptionDone='Write json'))
factory_Android_master.addStep(ShellCommand(command=["../cordova-cli/bin/cordova","platform","add","android"],workdir='build/mobilespec',haltOnFailure=True, description='Platform Add',descriptionDone='Platform Add'))