You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by db...@apache.org on 2015/05/28 21:23:32 UTC
cordova-medic git commit: INFRA-9622 Removing old Cordova slaves.
Renaming cordova-ios-slave to cordova-osx-slave.
Repository: cordova-medic
Updated Branches:
refs/heads/master 5c5a01807 -> 15f5d2bef
INFRA-9622 Removing old Cordova slaves. Renaming cordova-ios-slave to cordova-osx-slave.
Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/15f5d2be
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/15f5d2be
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/15f5d2be
Branch: refs/heads/master
Commit: 15f5d2befb7b423d0519496316c3fc2c61d97770
Parents: 5c5a018
Author: Dmitry Blotsky <dm...@gmail.com>
Authored: Wed May 27 00:30:25 2015 -0700
Committer: Dmitry Blotsky <dm...@gmail.com>
Committed: Wed May 27 00:30:25 2015 -0700
----------------------------------------------------------------------
buildbot-conf/cordova.conf | 2 +-
buildbot-conf/master.cfg | 30 ++----------------------------
buildbot-conf/private.py.sample | 8 ++------
3 files changed, 5 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/15f5d2be/buildbot-conf/cordova.conf
----------------------------------------------------------------------
diff --git a/buildbot-conf/cordova.conf b/buildbot-conf/cordova.conf
index 0525ef6..817b43a 100644
--- a/buildbot-conf/cordova.conf
+++ b/buildbot-conf/cordova.conf
@@ -188,7 +188,7 @@ def Download(mastersrc, slavedest, description, **kwargs):
# these slave names refer to the ones specified in master.cfg,
# and they must remain defined in master.cfg in order to work
# with the master.cfg used on Apache's Buildbot
-OSX_SLAVES = ['cordova-ios-slave']
+OSX_SLAVES = ['cordova-osx-slave']
WINDOWS_SLAVES = ['cordova-windows-slave']
####### CHANGESOURCES
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/15f5d2be/buildbot-conf/master.cfg
----------------------------------------------------------------------
diff --git a/buildbot-conf/master.cfg b/buildbot-conf/master.cfg
index 83b2a3a..157c254 100644
--- a/buildbot-conf/master.cfg
+++ b/buildbot-conf/master.cfg
@@ -49,8 +49,8 @@ c['slaves'].extend([
# used slaves
BuildSlave(
- 'cordova-ios-slave',
- private.cordovaIOSSlavePwd,
+ 'cordova-osx-slave',
+ private.cordovaOSXSlavePwd,
missing_timeout = 300,
max_builds = 1
),
@@ -60,32 +60,6 @@ c['slaves'].extend([
missing_timeout = 300,
max_builds = 1
),
-
- # obsolete slaves
- BuildSlave(
- 'cordova-android-slave',
- private.cordovaAndroidSlavePwd,
- missing_timeout = 300,
- max_builds = 1
- ),
- BuildSlave(
- 'cordova-win8-slave',
- private.cordovaWin8SlavePwd,
- missing_timeout = 300,
- max_builds = 2
- ),
- BuildSlave(
- 'cordova-blackberry-slave',
- private.cordovaBlackberrySlavePwd,
- missing_timeout = 300,
- max_builds = 1
- ),
- BuildSlave(
- 'cordova-common-slave',
- private.cordovaCommonSlavePwd,
- missing_timeout = 300,
- max_builds = 3
- ),
])
# to limit to two concurrent builds on a slave, use
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/15f5d2be/buildbot-conf/private.py.sample
----------------------------------------------------------------------
diff --git a/buildbot-conf/private.py.sample b/buildbot-conf/private.py.sample
index 776e2b8..ca8e346 100644
--- a/buildbot-conf/private.py.sample
+++ b/buildbot-conf/private.py.sample
@@ -3,9 +3,5 @@ pbcsPwd = 'password'
webAuthUser = 'password'
webAuthPwd = 'password'
-cordovaIOSSlavePwd = 'password'
-cordovaWindowsSlavePwd = 'password'
-cordovaAndroidSlavePwd = 'password'
-cordovaWin8SlavePwd = 'password'
-cordovaBlackberrySlavePwd = 'password'
-cordovaCommonSlavePwd = 'password'
+cordovaOSXSlavePwd = 'password'
+cordovaWindowsSlavePwd = 'password'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org