Bug 942846 - Migrate 20 w64-ix-slave to rev2. day5 batch2 -> rev2. r=rail
authorJohn Hopkins <jhopkins@mozilla.com>
Tue, 26 Nov 2013 12:00:05 -0500
changeset 9485 a016cbb84a09128dcfe01ae86066cd538349043d
parent 9484 9b0db4adf95372295a9704f34c4da671ab5b1082
child 9486 f55ef45d3b89c1ab4aebfcbcbf8f894128ce1a23
child 9487 1f56e6dc01e1cc0146ef7e69e2f3738bf4597558
push id7057
push userjhopkins@mozilla.com
push dateTue, 26 Nov 2013 17:00:11 +0000
reviewersrail
bugs942846
Bug 942846 - Migrate 20 w64-ix-slave to rev2. day5 batch2 -> rev2. r=rail
mozilla/b2g_config.py
mozilla/config.py
mozilla/production_config.py
mozilla/thunderbird_config.py
--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -1136,17 +1136,17 @@ BRANCHES['try']['platforms']['emulator-j
 BRANCHES['try']['platforms']['emulator-jb']['mozharness_config']['extra_args'] = ['--target', 'generic', '--config', 'b2g/releng-try.py', '--b2g-config-dir', 'emulator-jb', '--gaia-languages-file', 'locales/languages_dev.json', '--gecko-languages-file', 'gecko/b2g/locales/all-locales']
 BRANCHES['try']['platforms']['emulator-jb-debug']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['emulator-jb-debug']['mozharness_config']['extra_args'] = ['--target', 'generic', '--config', 'b2g/releng-try.py', '--b2g-config-dir', 'emulator-jb', '--debug', '--gaia-languages-file', 'locales/languages_dev.json', '--gecko-languages-file', 'gecko/b2g/locales/all-locales']
 
 # Migrate branches to win64-rev2 platform (bug 918414)
 disabled_branches = set([x for x in BRANCHES.keys() if x not in PROJECT_BRANCHES.keys() + ['try']] + ['b2g-inbound', 'mozilla-inbound'])
 mixed_masters = ['buildbot-master66']
 mixed_branches = ['mozilla-inbound', 'b2g-inbound', 'mozilla-central']
-win64_mix_size = 47
+win64_mix_size = 52
 for b in mixed_branches:
     if b not in disabled_branches:
         raise Exception("win64-rev2 mixed branch '%s' must be in disabled branches list")
 win64_rev2_master = False
 for m in mixed_masters:
     if m in uname()[1]:
         win64_rev2_master = True
         break
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2227,17 +2227,17 @@ for b in BRANCHES.keys():
     if b not in ('mozilla-b2g18', 'mozilla-b2g18_v1_0_1', 'mozilla-b2g18_v1_1_0_hd'):
         if 'android-noion' in BRANCHES[b]['platforms']:
             del BRANCHES[b]['platforms']['android-noion']
 
 # Migrate branches to win64-rev2 platform (bug 918414)
 disabled_branches = set([x for x in BRANCHES.keys() if x not in PROJECT_BRANCHES.keys() + ['try']] + ['b2g-inbound','mozilla-inbound'])
 mixed_masters = ['buildbot-master66']
 mixed_branches = ['mozilla-inbound','mozilla-central']
-win64_mix_size = 47
+win64_mix_size = 52
 for b in mixed_branches:
     if b not in disabled_branches:
         raise Exception("win64-rev2 mixed branch '%s' must be in disabled branches list")
 win64_rev2_master = False
 for m in mixed_masters:
     if m in uname()[1]:
         win64_rev2_master = True
         break
--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -1,17 +1,16 @@
 MAC_LION_MINIS = ['bld-lion-r5-%03d' % x for x in range(1,16) + range(41,87) + [88] + range(93,95)]
 LINUX_VMS      = ['bld-centos5-32-vmw-%03i' % x for x in range(1,7)]
 LINUX_IXS      = ['linux-ix-slave%02i' % x for x in [1,2,6]]
 LINUX64_IXS    = ['linux64-ix-slave%02i' % x for x in range(3, 7)]
 WIN32_IXS      = ['mw32-ix-slave%02i' % x for x in range(2,13)]
-WIN64_IXS      = ['w64-ix-slave%02i' % x for x in range(98,100)] + \
-                 ['w64-ix-slave%03i' % x for x in range(100,158) if x not in range(110,131)]
-WIN64_REV2     = ['w64-ix-slave%02i' % x for x in range(6,30) + range(42,44) + range(75,98) if x not in [22,80,85,86]] + \
-                 ['w64-ix-slave%03i' % x for x in range(111,131)]
+WIN64_IXS      = ['w64-ix-slave%03i' % x for x in range(103,158) if x not in range(110,131)]
+WIN64_REV2     = ['w64-ix-slave%02i' % x for x in range(6,30) + range(42,44) + range(75,100) if x not in [22,80,85,86]] + \
+                 ['w64-ix-slave%03i' % x for x in range(100,103) + range(111,131)]
 MOCK_DL120G7   = ['bld-centos6-hp-%03d' % x for x in range(6,24)] # 5 staging, 17 prod, 17 try
 LINUX64_EC2    = ['bld-linux64-ec2-%03d' % x for x in range(1, 900)]
 MOCK_IX        = ['bld-linux64-ix-%03d' % x for x in range(27, 38)]
 if set(WIN64_REV2).intersection(set(WIN64_IXS)):
     raise Exception('WIN64_REV2 and WIN64_IXS overlap')
 
 SLAVES = {
     'linux':            LINUX_VMS + LINUX_IXS,
--- a/mozilla/thunderbird_config.py
+++ b/mozilla/thunderbird_config.py
@@ -1149,17 +1149,17 @@ for name, branch in items_before(BRANCHE
                     'gstreamer-devel', 'gstreamer-plugins-base-devel',
                     'gstreamer-devel.i686', 'gstreamer-plugins-base-devel.i686',
                 )]
 
 # Migrate branches to win64-rev2 platform (bug 918414)
 disabled_branches = [x for x in BRANCHES.keys() if x not in ['try-comm-central']]
 mixed_masters = ['buildbot-master66']
 mixed_branches = ['comm-central']
-win64_mix_size = 47
+win64_mix_size = 52
 for b in mixed_branches:
     if b not in disabled_branches:
         raise Exception("win64-rev2 mixed branch '%s' must be in disabled branches list")
 win64_rev2_master = False
 for m in mixed_masters:
     if m in uname()[1]:
         win64_rev2_master = True
         break