Bug 1274300 - Remove b-2008-ix, talos-linux32 from buildbot-configs and slavealloc, r=kmoir
authorAlin Selagea <aselagea@mozilla.com>
Fri, 20 May 2016 16:39:53 +0300 (2016-05-20)
changeset 14234 1995d0e79cab0652b03b8e357a98756457a43316
parent 14233 c4f4ea55bd30b39eb30ad2ec92081207cbc61d45
child 14235 1ad733905a5b1e458e0420e8346878b4265fa68c
push id9985
push useraselagea@mozilla.com
push dateFri, 20 May 2016 13:43:13 +0000 (2016-05-20)
reviewerskmoir
bugs1274300
Bug 1274300 - Remove b-2008-ix, talos-linux32 from buildbot-configs and slavealloc, r=kmoir
mozilla/production_config.py
mozilla/staging_config.py
--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -1,13 +1,12 @@
 MAC_LION_MINIS = ['bld-lion-r5-%03d' % x for x in range(1,7) + range(41,55) + range(56,69) + \
                   range(70,87) + range(88,95)]
 
-WIN64_REV2     = ['b-2008-ix-%04i' % x for x in range(1,18) + range(65,89) + range(90,159) + range(161,173)] + \
-                 ['b-2008-ec2-%04d' % x for x in range(1, 31)] + \
+WIN64_REV2     = ['b-2008-ec2-%04d' % x for x in range(1, 31)] + \
                  ['b-2008-spot-%03d' % x for x in range(1, 201)]
 
 LINUX64_EC2    = ['bld-linux64-ec2-%03d' % x for x in range(1, 50) + range(301, 350)] + \
                  ['bld-linux64-spot-%03d' % x for x in range(1, 300) + range(300, 600)] + \
                  ['bld-linux64-spot-%d' % x for x in range(1000, 1100)]
 
 LINUX64_AV_EC2 = ['av-linux64-ec2-%03d' % x for x in range(1,5)] + \
     ['av-linux64-spot-%03d' % x for x in range(1,5)]
@@ -18,18 +17,17 @@ SLAVES = {
     'mock':             LINUX64_EC2,
     'linux64-av':       LINUX64_AV_EC2,
 }
 
 TRY_MAC64       = []
 TRY_LINUX64_EC2 = ['try-linux64-ec2-%03d' % x for x in range(1, 60) + range(301,340)] + \
                   ['try-linux64-spot-%03d' % x for x in range(1, 200) + range(300,500)] + \
                   ['try-linux64-spot-%d' % x for x in range(1000, 1100)]
-TRY_WIN64_REV2  = ['b-2008-ix-%04i' % x for x in range(18, 65) + range(173, 175) + range(176, 185)] + \
-                  ['y-2008-ec2-%04d' % x for x in range(1, 31)] + \
+TRY_WIN64_REV2  = ['y-2008-ec2-%04d' % x for x in range(1, 31)] + \
                   ['y-2008-spot-%03d' % x for x in range(1, 201)]
 TRY_LION        = ['bld-lion-r5-%03d' % x for x in range(7,31) + range(32,37)] + \
                   ['bld-lion-r5-%03d' % x for x in range(95,97)]
 
 if set(TRY_WIN64_REV2).intersection(WIN64_REV2):
     raise Exception('TRY_WIN64_REV2 and WIN64_REV2 overlap')
 
 TRY_SLAVES = {
--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -15,18 +15,17 @@ LINUX64_AV_EC2_DEV = ['dev-av-linux64-ec
 SLAVES['linux64-av'].extend(LINUX64_AV_EC2_DEV)
 
 WIN64_RELOPS     = ['ix-mn-w0864-%03d' % x for x in range(1,3)]
 SLAVES['win64-rev2'].extend(WIN64_RELOPS)
 TRY_SLAVES['win64-rev2'].extend(WIN64_RELOPS)
 
 # AWS EC2 (b|y)-2008 spot and on-demand staging instances.
 B2008 = ['b-2008-spot-%03d' % x for x in range(990, 1000)] + \
-        ['b-2008-ec2-%04d' % x for x in range(990, 1000)] + \
-        ['b-2008-ix-0175']
+        ['b-2008-ec2-%04d' % x for x in range(990, 1000)]
 Y2008 = ['y-2008-spot-%03d' % x for x in range(990, 1000)] + \
         ['y-2008-ec2-%04d' % x for x in range(990, 1000)]
 SLAVES['win64-rev2'].extend(B2008)
 TRY_SLAVES['win64-rev2'].extend(Y2008)
 
 GLOBAL_VARS = {
     'staging': True,
     'config_repo_path': 'users/stage-ffxbld/buildbot-configs',