bug 646358 - turn on mozilla-2.1 builds. r=catlee
--- a/mozilla/production_builder_master_bm01_localconfig.py
+++ b/mozilla/production_builder_master_bm01_localconfig.py
@@ -7,18 +7,18 @@ c['status'] = [
]
c['buildbotURL'] = 'http://buildbot-master1.build.scl1.mozilla.com:8010/'
from buildbot import manhole
c['manhole'] = manhole.PasswordManhole("tcp:1235:interface=127.0.0.1", "cltbld", "password")
from config import BRANCHES, SLAVES, PROJECTS, ACTIVE_PROJECT_BRANCHES
-ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
- 'mozilla-2.0', # 'mozilla-2.1',
+ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
+ 'mozilla-2.0', 'mozilla-2.1',
] + ACTIVE_PROJECT_BRANCHES
ACTIVE_PROJECTS = PROJECTS.keys()
ACTIVE_RELEASE_BRANCHES = []
# Set up our fast slaves
# No need to reload, this is reloaded by builder_master.cfg
import buildbotcustom.misc
buildbotcustom.misc.fastRegexes.extend([
--- a/mozilla/production_builder_master_bm02_localconfig.py
+++ b/mozilla/production_builder_master_bm02_localconfig.py
@@ -7,18 +7,18 @@ c['status'] = [
]
c['buildbotURL'] = 'http://buildbot-master2.build.scl1.mozilla.com:8010/'
from buildbot import manhole
c['manhole'] = manhole.PasswordManhole("tcp:1235:interface=127.0.0.1", "cltbld", "password")
from config import BRANCHES, SLAVES, PROJECTS, ACTIVE_PROJECT_BRANCHES
-ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
- 'mozilla-2.0', # 'mozilla-2.1',
+ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
+ 'mozilla-2.0', 'mozilla-2.1',
] + ACTIVE_PROJECT_BRANCHES
ACTIVE_PROJECTS = PROJECTS.keys()
ACTIVE_RELEASE_BRANCHES = []
# Set up our fast slaves
# No need to reload, this is reloaded by builder_master.cfg
import buildbotcustom.misc
buildbotcustom.misc.fastRegexes.extend([
--- a/mozilla/production_builder_master_bm04_localconfig.py
+++ b/mozilla/production_builder_master_bm04_localconfig.py
@@ -7,18 +7,18 @@ c['status'] = [
]
c['buildbotURL'] = 'http://buildbot-master4.build.mozilla.org:8010/'
from buildbot import manhole
c['manhole'] = manhole.PasswordManhole("tcp:1235:interface=127.0.0.1", "cltbld", "password")
from config import BRANCHES, SLAVES, PROJECTS, ACTIVE_PROJECT_BRANCHES
-ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
- 'mozilla-2.0', # 'mozilla-2.1',
+ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
+ 'mozilla-2.0', 'mozilla-2.1',
] + ACTIVE_PROJECT_BRANCHES
ACTIVE_PROJECTS = PROJECTS.keys()
ACTIVE_RELEASE_BRANCHES = []
# Set up our fast slaves
# No need to reload, this is reloaded by builder_master.cfg
import buildbotcustom.misc
buildbotcustom.misc.fastRegexes.extend([
--- a/mozilla/production_builder_master_bm05_localconfig.py
+++ b/mozilla/production_builder_master_bm05_localconfig.py
@@ -7,18 +7,18 @@ c['status'] = [
]
c['buildbotURL'] = 'http://buildbot-master5.build.mozilla.org:8010/'
from buildbot import manhole
c['manhole'] = manhole.PasswordManhole("tcp:1235:interface=127.0.0.1", "cltbld", "password")
from config import BRANCHES, SLAVES, PROJECTS, ACTIVE_PROJECT_BRANCHES
-ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
- 'mozilla-2.0', # 'mozilla-2.1',
+ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
+ 'mozilla-2.0', 'mozilla-2.1',
] + ACTIVE_PROJECT_BRANCHES
ACTIVE_PROJECTS = PROJECTS.keys()
ACTIVE_RELEASE_BRANCHES = []
# Set up our fast slaves
# No need to reload, this is reloaded by builder_master.cfg
import buildbotcustom.misc
buildbotcustom.misc.fastRegexes.extend([
--- a/mozilla/production_builder_master_bm06_localconfig.py
+++ b/mozilla/production_builder_master_bm06_localconfig.py
@@ -7,18 +7,18 @@ c['status'] = [
]
c['buildbotURL'] = 'http://buildbot-master6.build.mozilla.org:8010/'
from buildbot import manhole
c['manhole'] = manhole.PasswordManhole("tcp:1235:interface=127.0.0.1", "cltbld", "password")
from config import BRANCHES, SLAVES, PROJECTS, ACTIVE_PROJECT_BRANCHES
-ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
- 'mozilla-2.0', # 'mozilla-2.1',
+ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
+ 'mozilla-2.0', 'mozilla-2.1',
] + ACTIVE_PROJECT_BRANCHES
ACTIVE_PROJECTS = PROJECTS.keys()
ACTIVE_RELEASE_BRANCHES = []
# Set up our fast slaves
# No need to reload, this is reloaded by builder_master.cfg
import buildbotcustom.misc
buildbotcustom.misc.fastRegexes.extend([
--- a/mozilla/production_builder_master_pm01_localconfig.py
+++ b/mozilla/production_builder_master_pm01_localconfig.py
@@ -7,18 +7,18 @@ c['status'] = [
]
c['buildbotURL'] = 'http://production-master01.build.mozilla.org:8010/'
from buildbot import manhole
c['manhole'] = manhole.PasswordManhole("tcp:1235:interface=127.0.0.1", "cltbld", "password")
from config import BRANCHES, SLAVES, PROJECTS, ACTIVE_PROJECT_BRANCHES
-ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
- 'mozilla-2.0', # 'mozilla-2.1',
+ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
+ 'mozilla-2.0', 'mozilla-2.1',
] + ACTIVE_PROJECT_BRANCHES
ACTIVE_PROJECTS = PROJECTS.keys()
ACTIVE_RELEASE_BRANCHES = ['mozilla-1.9.1', 'mozilla-2.0', ]
# Set up our fast slaves
# No need to reload, this is reloaded by builder_master.cfg
import buildbotcustom.misc
buildbotcustom.misc.fastRegexes.extend([
--- a/mozilla/production_builder_master_pm03_localconfig.py
+++ b/mozilla/production_builder_master_pm03_localconfig.py
@@ -7,18 +7,18 @@ c['status'] = [
]
c['buildbotURL'] = 'http://production-master03.build.mozilla.org:8010/'
from buildbot import manhole
c['manhole'] = manhole.PasswordManhole("tcp:1235:interface=127.0.0.1", "cltbld", "password")
from config import BRANCHES, SLAVES, PROJECTS, ACTIVE_PROJECT_BRANCHES
-ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
- 'mozilla-2.0', # 'mozilla-2.1',
+ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
+ 'mozilla-2.0', 'mozilla-2.1',
] + ACTIVE_PROJECT_BRANCHES
ACTIVE_PROJECTS = PROJECTS.keys()
ACTIVE_RELEASE_BRANCHES = ['mozilla-1.9.2', ]
# Set up our fast slaves
# No need to reload, this is reloaded by builder_master.cfg
import buildbotcustom.misc
buildbotcustom.misc.fastRegexes.extend([
--- a/mozilla/scheduler_master.cfg
+++ b/mozilla/scheduler_master.cfg
@@ -13,17 +13,17 @@ for key, value in master_localconfig.Bui
if key in c:
c[key].extend(value)
else:
c[key] = value
from config import BRANCHES, PROJECTS, SLAVES
# Taking out mozilla-2.1 until official branching happens
-ACTIVE_BRANCHES = [b for b in BRANCHES.keys() if b not in ('mozilla-2.1',)]
+ACTIVE_BRANCHES = BRANCHES.keys()
ACTIVE_PROJECTS = PROJECTS.keys()
# generateBranchObjects breaks if there are no l10n_slaves, so we make it so
# there's an empty list for everything
from collections import defaultdict
for branch in BRANCHES:
BRANCHES[branch]['l10n_slaves'] = defaultdict(list)