gistfile.diff

diff --git a/mozilla-tests/config.py b/mozilla-tests/config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -131,21 +131,22 @@ PLATFORMS['linux']['mozharness_config'] 
     'mozharness_python': '/tools/buildbot/bin/python',
     'hg_bin': 'hg',
     'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
     'config_file': 'talos/linux_config.py',
 }
 
 
 PLATFORMS['linux64']['slave_platforms'] = ['ubuntu64_vm', 'ubuntu64_vm_lnx_large']
-PLATFORMS['linux64']['talos_slave_platforms'] = ['ubuntu64_hw']
+PLATFORMS['linux64']['talos_slave_platforms'] = ['ubuntu64_hw', 'ubuntu64_vm_lnx_talos_large']
 PLATFORMS['linux64']['env_name'] = 'linux-perf'
 PLATFORMS['linux64']['ubuntu64_vm'] = {'name': 'Ubuntu VM 12.04 x64'}
 PLATFORMS['linux64']['ubuntu64_hw'] = {'name': 'Ubuntu HW 12.04 x64'}
 PLATFORMS['linux64']['ubuntu64_vm_lnx_large'] = {'name': 'Ubuntu VM large 12.04 x64'}
+PLATFORMS['linux64']['ubuntu64_vm_lnx_talos_large'] = {'name': 'Ubuntu Talos VM large 12.04 x64'}
 PLATFORMS['linux64']['stage_product'] = 'firefox'
 PLATFORMS['linux64']['mozharness_config'] = {
     'mozharness_python': '/tools/buildbot/bin/python',
     'hg_bin': 'hg',
     'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
     'config_file': 'talos/linux_config.py',
 }
 
@@ -1039,16 +1040,17 @@ PLATFORM_UNITTEST_VARS = {
         'product_name': 'firefox',
         'app_name': 'browser',
         'brand_name': 'Minefield',
         'builds_before_reboot': 1,
         'unittest-env': {'DISPLAY': ':0'},
         'enable_opt_unittests': True,
         'enable_debug_unittests': True,
         'ubuntu64_hw': {},
+        'ubuntu64_vm_lnx_talos_large': {},
         'ubuntu64_vm': {
             'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'] + JITTEST_CHUNKED + \
                                    MARIONETTE + REFTEST_NOACCEL_TWO_CHUNKS + REFTEST_TWO_CHUNKS + \
                                    WEB_PLATFORM_REFTESTS + WEB_PLATFORM_TESTS_CHUNKED,
             'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'] + JITTEST_CHUNKED + \
                                     REFTEST_FOUR_CHUNKS,
             'suite_config': {
                 'cppunit': {
@@ -3089,16 +3091,17 @@ for platform in PLATFORMS.keys():
                     BRANCHES[name]['platforms'][platform][slave_platform]['opt_unittest_suites'] += GTEST
 
 delete_slave_platform(BRANCHES, PLATFORMS, {'linux64-cc': 'ubuntu64_vm'}, branch_exclusions=["try"])
 delete_slave_platform(BRANCHES, PLATFORMS, {'linux64-cc': 'ubuntu64_vm_lnx_large'}, branch_exclusions=["try"])
 delete_slave_platform(BRANCHES, PLATFORMS, {'linux64-tsan': 'ubuntu64_vm' }, branch_exclusions=["try"])
 delete_slave_platform(BRANCHES, PLATFORMS, {'linux64-tsan': 'ubuntu64_vm_lnx_large'}, branch_exclusions=["try"])
 delete_slave_platform(BRANCHES, PLATFORMS, {'linux64-asan': 'ubuntu64_vm'}, branch_exclusions=ride_trains_branches)
 delete_slave_platform(BRANCHES, PLATFORMS, {'linux64-asan': 'ubuntu64-asan_vm_lnx_large'}, branch_exclusions=ride_trains_branches)
+delete_slave_platform(BRANCHES, PLATFORMS, {'linux64': 'ubuntu64_vm_lnx_talos_large'}, branch_exclusions=["try"])
 
 # bug 1217534 delete_slave_platform deletes talos too so we need to delete the ubuntu64_vm_lnx_large
 # slave platform a different way otherwise it deletes all talos jobs on linux64 for the non-excluded branches
 for name in BRANCHES.keys():
     if name in ride_trains_branches:
         continue
     if 'linux64' not in BRANCHES[name]['platforms']:
         continue
@@ -3152,27 +3155,16 @@ delete_slave_platform(BRANCHES, PLATFORM
 # Explicitly don't remove win7-ix from talos
 for branch in set(BRANCHES.keys()) - set(win7_vm_inactive_branches):
     for platform in ('win32', 'win64'):
         if platform not in BRANCHES[branch]['platforms']:
             continue
         if nested_haskey(BRANCHES[branch]['platforms'], platform, 'win7-ix'):
             del BRANCHES[branch]['platforms'][platform]['win7-ix']
 
-# Bug 1253341 - run talos jobs on AWS
-for branch in ('try',):
-    BRANCHES[branch]['platforms']['linux64']['talos_slave_platforms'] = ['ubuntu64_hw', 'ubuntu64_vm_large']
-    # Add ubuntu64_vm to the talos suites
-    for test, test_config in BRANCHES[branch].items():
-        if not test.endswith('_tests'):
-            continue
-        tests, merge, extra, platforms = test_config
-        if 'ubuntu64_hw' in platforms and 'ubuntu64_vm_large' not in platforms:
-            platforms = platforms + ['ubuntu64_vm_large']
-            BRANCHES[branch][test] = (tests, merge, extra, platforms)
 
 if __name__ == "__main__":
     import sys
     import pprint
 
     args = sys.argv[1:]
 
     if len(args) > 0:
diff --git a/mozilla-tests/production_config.py b/mozilla-tests/production_config.py
--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -6,16 +6,17 @@ SLAVES = {
     'win10': {},
     'snowleopard': {},
     'yosemite': {},
     'yosemite_r7': {},
     'ubuntu32_vm': {},
     'ubuntu64_vm': {},
     'ubuntu64_vm_large': {},
     'ubuntu64_vm_lnx_large': {},
+    'ubuntu64_vm_lnx_talos_large': {},
     'ubuntu64-asan_vm_lnx_large': {},
     'ubuntu64_hw': {},
     'win64_vm': {},
 }
 
 for i in range(1, 123):  # XP slaves from 123 onwards moved to Win7 and Win8 pools // Bug 1226729 // Bug 1239785 // Bug 1255812
     SLAVES['xp-ix']['t-xp32-ix-%03i' % i] = {}
 
@@ -68,16 +69,17 @@ SLAVES['ubuntu64_vm-b2g-emulator-jb'] = 
 SLAVES['ubuntu64_vm-b2g-emulator-kk'] = SLAVES['ubuntu64_vm']
 SLAVES['ubuntu64_hw-b2g'] = SLAVES['ubuntu64_hw']
 SLAVES['win8_64'] = SLAVES['win8']
 SLAVES['win10_64'] = SLAVES['win10']
 SLAVES['ubuntu64_vm_mobile'] = SLAVES['ubuntu64_vm']
 SLAVES['ubuntu64_vm_armv7_mobile'] = SLAVES['ubuntu64_vm']
 SLAVES['ubuntu64_vm_armv7_large'] = SLAVES['ubuntu64_vm_large']
 SLAVES['ubuntu64_vm_lnx_large'] = SLAVES['ubuntu64_vm_large']
+SLAVES['ubuntu64_vm_lnx_talos_large'] = SLAVES['ubuntu64_vm_large']
 SLAVES['ubuntu64-asan_vm_lnx_large'] = SLAVES['ubuntu64_vm_large']
 
 TRY_SLAVES = {}
 
 GRAPH_CONFIG = ['--resultsServer', 'graphs.mozilla.org',
                 '--resultsLink', '/server/collect.cgi']
 
 GLOBAL_VARS = {