Bug 1253341 - Run duplicate Talos jobs in AWS for Linux (reverted). r=Callek
authorJoel Maher <jmaher@mozilla.com>
Fri, 29 Apr 2016 06:26:42 -0400 (2016-04-29)
changeset 14181 2302dc47cb210d7104f4df6b71ed989a9b54b343
parent 14179 29f4c35c876bd8062cfe29b62c4008f236e0a6bc
child 14184 48e0db6d4d227412aa9e9368fc9d9227ffe0992e
push id9947
push userraliiev@mozilla.com
push dateFri, 06 May 2016 17:04:08 +0000 (2016-05-06)
reviewersCallek
bugs1253341
Bug 1253341 - Run duplicate Talos jobs in AWS for Linux (reverted). r=Callek [mq]: revert_2talos.patch MozReview-Commit-ID: FYKS0B15UeK
mozilla-tests/config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -3259,30 +3259,16 @@ for platform in PLATFORMS.keys():
 
 # Bug 1254580 - Only run Windows in AWS for try
 for branch in set(BRANCHES) - set(['try']):
     if nested_haskey(BRANCHES[branch]['platforms'], 'win32', 'win7_vm'):
         del BRANCHES[branch]['platforms']['win32']['win7_vm']
     if nested_haskey(BRANCHES[branch]['platforms'], 'win32', 'win7_vm_gfx'):
         del BRANCHES[branch]['platforms']['win32']['win7_vm_gfx']
 
-
-# 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)
-
-
 #Bug 1269543 - Stop running tests on OS X 10.6 on Firefox 49+
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 49):
     if name in ['try']:
         continue
     for platform in branch['platforms'].keys():
         if platform not in ['macosx64']:
             continue
         for slave_platform in ['snowleopard']: