bug 694106 r=aki remove tegra try pool
☠☠ backed out by bff72a0c01c0 ☠ ☠
authorMike Taylor <bear@mozilla.com>
Wed, 12 Oct 2011 17:07:31 -0400
changeset 4895 a2ba18b9866f3199e59035b16003ea85f56b0eab
parent 4894 46d7be1f8d9bec3a36292b344d7f8136926bdf4d
child 4897 bff72a0c01c0858ad033235185be79135a0a1223
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewersaki
bugs694106
bug 694106 r=aki remove tegra try pool
mozilla-tests/config.py
mozilla-tests/preproduction_config.py
mozilla-tests/production_addon_config.py
mozilla-tests/production_config.py
mozilla-tests/staging_addon_config.py
mozilla-tests/staging_ateam_config.py
mozilla-tests/staging_config.py
mozilla-tests/tests_master.cfg
mozilla-tests/universal_master_sqlite.cfg
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -3,17 +3,17 @@ from copy import deepcopy
 from buildbot.steps.shell import WithProperties
 
 import project_branches
 reload(project_branches)
 from project_branches import PROJECT_BRANCHES, ACTIVE_PROJECT_BRANCHES
 
 import localconfig
 reload(localconfig)
-from localconfig import SLAVES, TRY_SLAVES, GLOBAL_VARS, GRAPH_CONFIG
+from localconfig import SLAVES, GLOBAL_VARS, GRAPH_CONFIG
 
 REMOTE_PROCESS_NAMES = { 'default':         'org.mozilla.fennec',
                          'mozilla-beta':    'org.mozilla.firefox_beta',
                          'mozilla-aurora':  'org.mozilla.fennec_aurora',
                          'mozilla-release': 'org.mozilla.firefox',
                        }
 
 TALOS_CMD = ['python', 'run_tests.py', '--noisy', WithProperties('%(configFile)s')]
@@ -113,20 +113,16 @@ PLATFORMS['linux-android']['stage_produc
 PLATFORMS['linux-android']['stage_platform'] = 'android'
 
 
 # Lets be explicit instead of magical.  leopard-o should be a second
 # entry in the SLAVE dict
 for platform, platform_config in PLATFORMS.items():
     for slave_platform in platform_config['slave_platforms']:
         platform_config[slave_platform]['slaves'] = sorted(SLAVES[slave_platform])
-        if slave_platform in TRY_SLAVES:
-            platform_config[slave_platform]['try_slaves'] = sorted(TRY_SLAVES[slave_platform])
-        else:
-            platform_config[slave_platform]['try_slaves'] = platform_config[slave_platform]['slaves']
 
 MOBILE_PLATFORMS = PLATFORMS['linux-android']['slave_platforms']
 
 ALL_PLATFORMS = PLATFORMS['linux']['slave_platforms'] + \
                 PLATFORMS['linux64']['slave_platforms'] + \
                 PLATFORMS['win32']['slave_platforms'] + \
                 PLATFORMS['macosx64']['slave_platforms']
 
--- a/mozilla-tests/preproduction_config.py
+++ b/mozilla-tests/preproduction_config.py
@@ -1,26 +1,22 @@
-TEGRAS     = dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(1,65) + range(105,124)])
-TRY_TEGRAS = dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(65,105)])
 SLAVES = {
     'fedora': dict([("talos-r3-fed-%03i" % x, {}) for x in range(1,64)]),
     'fedora64' : dict([("talos-r3-fed64-%03i" % x, {}) for x in range (1,64)]),
     'xp': dict([("talos-r3-xp-%03i" % x, {}) for x in range(1,63)]),
     'win7': dict([("talos-r3-w7-%03i" % x, {}) for x in range(1,65)]),
     'w764': dict([("t-r3-w764-%03i" % x, {}) for x in range(1,6)]),
     'leopard': dict([("talos-r3-leopard-%03i" % x, {}) for x in range(1,60)]),
     'snowleopard': dict([("talos-r3-snow-%03i" % x, {}) for x in range(1,60)]),
     'snowleopard-r4': dict([("talos-r4-snow-%03i" % x, {}) for x in range(1,160)]),
-    'tegra_android': TEGRAS,
+    'tegra_android': dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(1,124)]),
 }
 
 SLAVES['leopard-o'] = SLAVES['leopard']
 
-TRY_SLAVES = {'tegra_android': TRY_TEGRAS}
-
 GRAPH_CONFIG = ['--resultsServer', 'graphs-stage.mozilla.org',
     '--resultsLink', '/server/collect.cgi']
 
 GLOBAL_VARS = {
     'disable_tinderbox_mail': True,
     'tinderbox_tree': 'MozillaTest',
     'mobile_tinderbox_tree': 'MobileTest',
     'build_tools_repo_path': 'users/prepr-ffxbld/tools',
--- a/mozilla-tests/production_addon_config.py
+++ b/mozilla-tests/production_addon_config.py
@@ -4,18 +4,16 @@ SLAVES = {
     'xp': dict([("addon-r3-xp-%03i" % x, {}) for x in range(1,4)]),
     'win7': dict([("addon-r3-w7-%03i" % x, {}) for x in range(1,4)]),
     'w764': dict([("addon-r3-w764-%03i" % x, {}) for x in range(1,4)]),
     'leopard': dict([("addon-r3-leopard-%03i" % x, {}) for x in range(1,4)]),
     'snowleopard': dict([("addon-r3-snow-%03i" % x, {}) for x in range(1,4)]),
     'tegra_android': dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(1,4)]),
 }
 
-TRY_SLAVES = {}
-
 GRAPH_CONFIG = ['--resultsServer', 'graphs.mozilla.org',
     '--resultsLink', '/server/collect.cgi']
 
 GLOBAL_VARS = {
     'build_tools_repo_path': 'build/tools',
     'stage_server': 'stage.mozilla.org',
     'stage_username': 'ffxbld',
     'stage_ssh_key': 'ffxbld_dsa',
--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -1,27 +1,22 @@
-TEGRAS     = dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(1,65) + range(105,124)])
-TRY_TEGRAS = dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(65,105)])
-
 SLAVES = {
     'fedora': dict([("talos-r3-fed-%03i" % x, {}) for x in range(3,10) + range(11,64)]),
     'fedora64' : dict([("talos-r3-fed64-%03i" % x, {}) for x in range (3,10) + range(11,60)]),
     'xp': dict([("talos-r3-xp-%03i" % x, {}) for x in range(4,10) + range(11,63)]),
     'win7': dict([("talos-r3-w7-%03i" % x, {}) for x in range(4,10) + range(11,65)]),
     'w764': dict([("t-r3-w764-%03i" % x, {}) for x in range(1,6)]),
     'leopard': dict([("talos-r3-leopard-%03i" % x, {}) for x in range(3,10) + range(11,60)]),
     'snowleopard': dict([("talos-r3-snow-%03i" % x, {}) for x in range(3,10) + range(11,60)]),
     'snowleopard-r4': dict([("talos-r4-snow-%03i" % x, {}) for x in range(3,10) + range(11,160)]),
-    'tegra_android': TEGRAS,
+    'tegra_android': dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(1,124)]),
 }
 
 SLAVES['leopard-o'] = SLAVES['leopard']
 
-TRY_SLAVES = {'tegra_android': TRY_TEGRAS}
-
 GRAPH_CONFIG = ['--resultsServer', 'graphs.mozilla.org',
     '--resultsLink', '/server/collect.cgi']
 
 GLOBAL_VARS = {
     'disable_tinderbox_mail': True,
     'build_tools_repo_path': 'build/tools',
     'stage_server': 'stage.mozilla.org',
     'stage_username': 'ffxbld',
@@ -73,17 +68,16 @@ BRANCHES = {
         'mobile_tinderbox_tree': 'AddonTester',
     },
     'try': {
         'tinderbox_tree': 'Try',
         'mobile_tinderbox_tree': 'Try',
         'enable_mail_notifier': True,
         'notify_real_author': True,
         'enable_merging': False,
-        'slave_key': 'try_slaves',
         'package_url': 'http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds',
         'package_dir': '%(who)s-%(got_revision)s',
         'stage_username': 'trybld',
         'stage_ssh_key': 'trybld_dsa',
     },
     'jaegermonkey': {
         'tinderbox_tree': 'Jaegermonkey',
         'mobile_tinderbox_tree': 'Jaegermonkey',
--- a/mozilla-tests/staging_addon_config.py
+++ b/mozilla-tests/staging_addon_config.py
@@ -4,18 +4,16 @@ SLAVES = {
     'xp': dict([("addon-r3-xp-%03i" % x, {}) for x in range(1,4)]),
     'win7': dict([("addon-r3-w7-%03i" % x, {}) for x in range(1,4)]),
     'w764': dict([("addon-r3-w764-%03i" % x, {}) for x in range(1,4)]),
     'leopard': dict([("addon-r3-leopard-%03i" % x, {}) for x in range(1,4)]),
     'snowleopard': dict([("addon-r3-snow-%03i" % x, {}) for x in range(1,4)]),
     'tegra_android': dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(1,4)]),
 }
 
-TRY_SLAVES = {}
-
 GRAPH_CONFIG = ['--resultsServer', 'graphs-stage.mozilla.org',
     '--resultsLink', '/server/collect.cgi']
 
 GLOBAL_VARS = {
     'tinderbox_tree': 'MozillaTest',
     'mobile_tinderbox_tree': 'MobileTest',
     'build_tools_repo_path': 'build/tools',
     'stage_server': 'staging-stage.build.mozilla.org',
--- a/mozilla-tests/staging_ateam_config.py
+++ b/mozilla-tests/staging_ateam_config.py
@@ -4,18 +4,16 @@ SLAVES = {
     'xp': dict([("tools-r3-xp-%03i" % x, {}) for x in range(1,4)]),
     'win7': dict([("tools-r3-w7-%03i" % x, {}) for x in range(1,4)]),
     'w764': dict([("tools-r3-w764-%03i" % x, {}) for x in range(1,4)]),
     'leopard': dict([("tools-r3-leopard-%03i" % x, {}) for x in range(1,4)]),
     'snowleopard': dict([("tools-r3-snow-%03i" % x, {}) for x in range(1,4)]),
     'tegra_android': dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(1,4)]),
 }
 
-TRY_SLAVES = {}
-
 GRAPH_CONFIG = ['--resultsServer', 'graphs-stage.mozilla.org',
     '--resultsLink', '/server/collect.cgi']
 
 GLOBAL_VARS = {
     'tinderbox_tree': 'MozillaTest',
     'mobile_tinderbox_tree': 'MobileTest',
     'build_tools_repo_path': 'build/tools',
     'stage_server': 'staging-stage.build.mozilla.org',
--- a/mozilla-tests/staging_config.py
+++ b/mozilla-tests/staging_config.py
@@ -1,26 +1,22 @@
-TEGRAS     = dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(1,65) + range(105,124)])
-TRY_TEGRAS = dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(65,105)])
 SLAVES = {
     'fedora': dict([("talos-r3-fed-%03i" % x, {}) for x in range(1,64)]),
     'fedora64' : dict([("talos-r3-fed64-%03i" % x, {}) for x in range (1,64)]),
     'xp': dict([("talos-r3-xp-%03i" % x, {}) for x in range(1,63)]),
     'win7': dict([("talos-r3-w7-%03i" % x, {}) for x in range(1,65)]),
     'w764': dict([("t-r3-w764-%03i" % x, {}) for x in range(1,6)]),
     'leopard': dict([("talos-r3-leopard-%03i" % x, {}) for x in range(1,60)]),
     'snowleopard': dict([("talos-r3-snow-%03i" % x, {}) for x in range(1,60)]),
     'snowleopard-r4': dict([("talos-r4-snow-%03i" % x, {}) for x in range(1,160)]),
-    'tegra_android': TEGRAS,
+    'tegra_android': dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(65,124)]),
 }
 
 SLAVES['leopard-o'] = SLAVES['leopard']
 
-TRY_SLAVES = {'tegra_android': TRY_TEGRAS}
-
 GRAPH_CONFIG = ['--resultsServer', 'graphs-stage.mozilla.org',
     '--resultsLink', '/server/collect.cgi']
 
 GLOBAL_VARS = {
     'disable_tinderbox_mail': True,
     'tinderbox_tree': 'MozillaTest',
     'mobile_tinderbox_tree': 'MobileTest',
     'build_tools_repo_path': 'build/tools',
--- a/mozilla-tests/tests_master.cfg
+++ b/mozilla-tests/tests_master.cfg
@@ -19,17 +19,17 @@ for key, value in master_localconfig.Bui
     else:
         c[key] = value
 
 # Create our QueueDir objects
 # This is reloaded in buildbotcustom.misc
 from mozilla_buildtools.queuedir import QueueDir
 commandsQueue = QueueDir('commands', '%s/commands' % master_localconfig.QUEUEDIR)
 
-from config import BRANCHES, PLATFORMS, SUITES, BRANCH_UNITTEST_VARS, SLAVES, TRY_SLAVES, PROJECTS
+from config import BRANCHES, PLATFORMS, SUITES, BRANCH_UNITTEST_VARS, SLAVES, PROJECTS
 from master_localconfig import ACTIVE_BRANCHES, ACTIVE_PLATFORMS, ACTIVE_PROJECTS
 
 import BuildSlaves
 reload(BuildSlaves)
 from BuildSlaves import SlavePasswords
 from buildbot.buildslave import BuildSlave
 
 # Handle active platforms
@@ -48,25 +48,16 @@ for p in PROJECTS:
 for slave_platform, slaves in SLAVES.items():
     # If this platform isn't active, skip it!
     if slave_platform not in all_slave_platforms:
         continue
     for name in sorted(slaves.keys()):
         c['slaves'].append(BuildSlave(name, SlavePasswords[slave_platform], max_builds=1,
                                       properties=slaves[name]))
 
-if 'try' in ACTIVE_BRANCHES:
-    for slave_platform, slaves in TRY_SLAVES.items():
-        # If this platform isn't active, skip it!
-        if slave_platform not in all_slave_platforms:
-            continue
-        for name in sorted(slaves.keys()):
-            c['slaves'].append(BuildSlave(name, SlavePasswords[slave_platform], max_builds=1,
-                                          properties=slaves[name]))
-
 from buildbotcustom.misc import generateTalosBranchObjects, generateProjectObjects, \
          mergeBuildObjects
 
 from buildbot.schedulers.triggerable import Triggerable
 
 buildObjects = {}
 
 for branch in ACTIVE_BRANCHES:
--- a/mozilla-tests/universal_master_sqlite.cfg
+++ b/mozilla-tests/universal_master_sqlite.cfg
@@ -19,17 +19,17 @@ for key, value in master_localconfig.Bui
     else:
         c[key] = value
 
 # Create our QueueDir objects
 # This is reloaded in buildbotcustom.misc
 from mozilla_buildtools.queuedir import QueueDir
 commandsQueue = QueueDir('commands', '%s/commands' % master_localconfig.QUEUEDIR)
 
-from config import BRANCHES, PLATFORMS, SUITES, BRANCH_UNITTEST_VARS, SLAVES, TRY_SLAVES, PROJECTS
+from config import BRANCHES, PLATFORMS, SUITES, BRANCH_UNITTEST_VARS, SLAVES, PROJECTS
 from master_localconfig import ACTIVE_BRANCHES, ACTIVE_PLATFORMS, ACTIVE_PROJECTS
 
 import BuildSlaves
 reload(BuildSlaves)
 from BuildSlaves import SlavePasswords
 from buildbot.buildslave import BuildSlave
 
 # Handle active platforms
@@ -48,25 +48,16 @@ for p in PROJECTS:
 for slave_platform, slaves in SLAVES.items():
     # If this platform isn't active, skip it!
     if slave_platform not in all_slave_platforms:
         continue
     for name in sorted(slaves.keys()):
         c['slaves'].append(BuildSlave(name, SlavePasswords[slave_platform], max_builds=1,
                                       properties=slaves[name]))
 
-if 'try' in ACTIVE_BRANCHES:
-    for slave_platform, slaves in TRY_SLAVES.items():
-        # If this platform isn't active, skip it!
-        if slave_platform not in all_slave_platforms:
-            continue
-        for name in sorted(slaves.keys()):
-            c['slaves'].append(BuildSlave(name, SlavePasswords[slave_platform], max_builds=1,
-                                          properties=slaves[name]))
-
 from buildbotcustom.misc import generateTalosBranchObjects, generateProjectObjects, \
          mergeBuildObjects
 
 from buildbot.schedulers.triggerable import Triggerable
 
 buildObjects = {}
 
 for branch in ACTIVE_BRANCHES: