Bug 747424 - Support Thunderbird in preproduction. r=aki
authorRail Aliiev <rail@mozilla.com>
Fri, 20 Apr 2012 17:19:28 -0400
changeset 5820 bb86325507c965b2487f5be25b84da7cb0c3f922
parent 5819 2afbf0c8ec027d3a1bc10ab5ac69913c21458678
child 5821 6dbc88493bddd3529cf52910fc354714dc0061d9
child 5822 b07a14bd84e4d173c1a9817008a7ae4b96fb701f
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewersaki
bugs747424
Bug 747424 - Support Thunderbird in preproduction. r=aki
mozilla-tests/preproduction_tests_master_localconfig.py
mozilla-tests/preproduction_tests_scheduler_master_localconfig.py
mozilla/preproduction_builder_master_localconfig.py
--- a/mozilla-tests/preproduction_tests_master_localconfig.py
+++ b/mozilla-tests/preproduction_tests_master_localconfig.py
@@ -7,14 +7,17 @@ c['status'] = [
 ]
 
 c['buildbotURL'] = 'http://preproduction-master.srv.releng.scl3.mozilla.com:8012/'
 
 from buildbot import manhole
 c['manhole'] = manhole.PasswordManhole("tcp:1236:interface=127.0.0.1", "cltbld", "password")
 
 from config import BRANCHES, PLATFORMS, PROJECTS
+import thunderbird_config
 # Do everything!
 ACTIVE_BRANCHES = BRANCHES.keys()
+ACTIVE_THUNDERBIRD_BRANCHES = thunderbird_config.BRANCHES.keys()
 ACTIVE_PLATFORMS = dict((k,None) for k in PLATFORMS.keys())
+ACTIVE_THUNDERBIRD_PLATFORMS = dict((platform, None) for platform in thunderbird_config.PLATFORMS.keys())
 ACTIVE_PROJECTS = PROJECTS.keys()
 
 QUEUEDIR = "/dev/shm/queue"
--- a/mozilla-tests/preproduction_tests_scheduler_master_localconfig.py
+++ b/mozilla-tests/preproduction_tests_scheduler_master_localconfig.py
@@ -1,13 +1,16 @@
 c = BuildmasterConfig = {}
 c['slavePortnum'] = 9008 # No slaves should be connecting here
 
 from buildbot import manhole
 c['manhole'] = manhole.PasswordManhole("tcp:1233:interface=127.0.0.1", "cltbld", "password")
 
 from config import BRANCHES, PLATFORMS, PROJECTS
+import thunderbird_config
 # Do everything!
 ACTIVE_BRANCHES = BRANCHES.keys()
+ACTIVE_THUNDERBIRD_BRANCHES = thunderbird_config.BRANCHES.keys()
 ACTIVE_PLATFORMS = dict((platform, None) for platform in PLATFORMS.keys())
+ACTIVE_THUNDERBIRD_PLATFORMS = dict((platform, None) for platform in thunderbird_config.PLATFORMS.keys())
 ACTIVE_PROJECTS = PROJECTS.keys()
 
 QUEUEDIR = "/dev/shm/queue"
--- a/mozilla/preproduction_builder_master_localconfig.py
+++ b/mozilla/preproduction_builder_master_localconfig.py
@@ -7,17 +7,19 @@ c['status'] = [
 ]
 
 c['buildbotURL'] = 'http://preproduction-master.srv.releng.scl3.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
+from thunderbird_config import BRANCHES as THUNDERBIRD_BRANCHES
 ACTIVE_BRANCHES = BRANCHES.keys()
+ACTIVE_THUNDERBIRD_BRANCHES = THUNDERBIRD_BRANCHES.keys()
 ACTIVE_PROJECTS = [p for p in PROJECTS.keys() if p != 'fuzzing']
 ACTIVE_RELEASE_BRANCHES = []
 ACTIVE_MOBILE_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([