Permalink
Browse files

Remove now-dead sjc1 masters from production-masters.json; fix datace…

…ntre attribute on new schedulers. r=catlee
  • Loading branch information...
1 parent 1022455 commit c1438f33c3a127c0803eaa3ac9692117ac1e5ef7 @mozbhearsum mozbhearsum committed May 10, 2012
Showing with 3 additions and 128 deletions.
  1. +1 −1 buildfarm/maintenance/check-master-json.py
  2. +2 −127 buildfarm/maintenance/production-masters.json
@@ -119,7 +119,7 @@ def check_master(master):
return False
# Check datacentre
- if master['datacentre'] not in ('mtv1', 'scl1', 'sjc1'):
+ if master['datacentre'] not in ('mtv1', 'scl1', 'scl3'):
log.error("%s - bad datacentre", name)
return False
@@ -57,81 +57,6 @@
"tools_branch": "default",
"tools_dir": "/builds/buildbot/tests1-macosx/tools"
},
- {
- "basedir": "/builds/buildbot/build1",
- "bbconfigs_branch": "production",
- "bbconfigs_dir": "/builds/buildbot/build1/buildbot-configs",
- "bbcustom_branch": "production-0.8",
- "bbcustom_dir": "/builds/buildbot/build1/buildbotcustom",
- "buildbot_bin": "/builds/buildbot/build1/bin/buildbot",
- "buildbot_branch": "production-0.8",
- "buildbot_python": "/builds/buildbot/build1/bin/python",
- "buildbot_setup": "/builds/buildbot/build1/buildbot/master/setup.py",
- "buildbot_version": "0.8.2",
- "datacentre": "sjc1",
- "db_name": "buildbot-master07.build.sjc1.mozilla.com:/builds/buildbot/build1/master",
- "enabled": false,
- "environment": "production",
- "hostname": "buildbot-master07.build.sjc1.mozilla.com",
- "http_port": 8001,
- "master_dir": "/builds/buildbot/build1/master",
- "name": "bm07-build1",
- "pb_port": 9001,
- "role": "build",
- "ssh_port": 7001,
- "tools_branch": "default",
- "tools_dir": "/builds/buildbot/build1/tools"
- },
- {
- "basedir": "/builds/buildbot/build1",
- "bbconfigs_branch": "production",
- "bbconfigs_dir": "/builds/buildbot/build1/buildbot-configs",
- "bbcustom_branch": "production-0.8",
- "bbcustom_dir": "/builds/buildbot/build1/buildbotcustom",
- "buildbot_bin": "/builds/buildbot/build1/bin/buildbot",
- "buildbot_branch": "production-0.8",
- "buildbot_python": "/builds/buildbot/build1/bin/python",
- "buildbot_setup": "/builds/buildbot/build1/buildbot/master/setup.py",
- "buildbot_version": "0.8.2",
- "datacentre": "sjc1",
- "db_name": "buildbot-master08.build.sjc1.mozilla.com:/builds/buildbot/build1/master",
- "enabled": false,
- "environment": "production",
- "hostname": "buildbot-master08.build.sjc1.mozilla.com",
- "http_port": 8001,
- "master_dir": "/builds/buildbot/build1/master",
- "name": "bm08-build1",
- "pb_port": 9001,
- "role": "build",
- "ssh_port": 7001,
- "tools_branch": "default",
- "tools_dir": "/builds/buildbot/build1/tools"
- },
- {
- "basedir": "/builds/buildbot/try1",
- "bbconfigs_branch": "production",
- "bbconfigs_dir": "/builds/buildbot/try1/buildbot-configs",
- "bbcustom_branch": "production-0.8",
- "bbcustom_dir": "/builds/buildbot/try1/buildbotcustom",
- "buildbot_bin": "/builds/buildbot/try1/bin/buildbot",
- "buildbot_branch": "production-0.8",
- "buildbot_python": "/builds/buildbot/try1/bin/python",
- "buildbot_setup": "/builds/buildbot/try1/buildbot/master/setup.py",
- "buildbot_version": "0.8.2",
- "datacentre": "sjc1",
- "db_name": "buildbot-master09.build.sjc1.mozilla.com:/builds/buildbot/try1/master",
- "enabled": false,
- "environment": "production",
- "hostname": "buildbot-master09.build.sjc1.mozilla.com",
- "http_port": 8101,
- "master_dir": "/builds/buildbot/try1/master",
- "name": "bm09-try1",
- "pb_port": 9101,
- "role": "try",
- "ssh_port": 7101,
- "tools_branch": "default",
- "tools_dir": "/builds/buildbot/try1/tools"
- },
{
"basedir": "/builds/buildbot/build_scheduler",
"bbconfigs_branch": "production",
@@ -143,7 +68,7 @@
"buildbot_python": "/builds/buildbot/build_scheduler/bin/python",
"buildbot_setup": "/builds/buildbot/build_scheduler/buildbot/master/setup.py",
"buildbot_version": "0.8.2",
- "datacentre": "sjc1",
+ "datacentre": "scl3",
"db_name": "buildbot-master36.srv.releng.scl3.mozilla.com:/builds/buildbot/build_scheduler/master",
"enabled": true,
"environment": "production",
@@ -167,7 +92,7 @@
"buildbot_python": "/builds/buildbot/tests_scheduler/bin/python",
"buildbot_setup": "/builds/buildbot/tests_scheduler/buildbot/master/setup.py",
"buildbot_version": "0.8.2",
- "datacentre": "sjc1",
+ "datacentre": "scl3",
"db_name": "buildbot-master36.srv.releng.scl3.mozilla.com:/builds/buildbot/tests_scheduler/master",
"enabled": true,
"environment": "production",
@@ -608,56 +533,6 @@
"tools_branch": "default",
"tools_dir": "/builds/buildbot/build1/tools"
},
- {
- "basedir": "/builds/buildbot/build1",
- "bbconfigs_branch": "production",
- "bbconfigs_dir": "/builds/buildbot/build1/buildbot-configs",
- "bbcustom_branch": "production-0.8",
- "bbcustom_dir": "/builds/buildbot/build1/buildbotcustom",
- "buildbot_bin": "/builds/buildbot/build1/bin/buildbot",
- "buildbot_branch": "production-0.8",
- "buildbot_python": "/builds/buildbot/build1/bin/python",
- "buildbot_setup": "/builds/buildbot/build1/buildbot/master/setup.py",
- "buildbot_version": "0.8.2",
- "datacentre": "sjc1",
- "db_name": "buildbot-master26.build.sjc1.mozilla.com:/builds/buildbot/build1/master",
- "enabled": false,
- "environment": "production",
- "hostname": "buildbot-master26.build.sjc1.mozilla.com",
- "http_port": 8001,
- "master_dir": "/builds/buildbot/build1/master",
- "name": "bm26-build1",
- "pb_port": 9001,
- "role": "build",
- "ssh_port": 7001,
- "tools_branch": "default",
- "tools_dir": "/builds/buildbot/build1/tools"
- },
- {
- "basedir": "/builds/buildbot/try1",
- "bbconfigs_branch": "production",
- "bbconfigs_dir": "/builds/buildbot/try1/buildbot-configs",
- "bbcustom_branch": "production-0.8",
- "bbcustom_dir": "/builds/buildbot/try1/buildbotcustom",
- "buildbot_bin": "/builds/buildbot/try1/bin/buildbot",
- "buildbot_branch": "production-0.8",
- "buildbot_python": "/builds/buildbot/try1/bin/python",
- "buildbot_setup": "/builds/buildbot/try1/buildbot/master/setup.py",
- "buildbot_version": "0.8.2",
- "datacentre": "sjc1",
- "db_name": "buildbot-master27.build.sjc1.mozilla.com:/builds/buildbot/try1/master",
- "enabled": false,
- "environment": "production",
- "hostname": "buildbot-master27.build.sjc1.mozilla.com",
- "http_port": 8101,
- "master_dir": "/builds/buildbot/try1/master",
- "name": "bm27-try1",
- "pb_port": 9101,
- "role": "try",
- "ssh_port": 7101,
- "tools_branch": "default",
- "tools_dir": "/builds/buildbot/try1/tools"
- },
{
"basedir": "/builds/buildbot/build1",
"bbconfigs_branch": "production",

0 comments on commit c1438f3

Please sign in to comment.