Bug 1253341 - Run duplicate Talos jobs in AWS for Linux (reverted). r=Callek
[mq]: revert_2talos.patch
MozReview-Commit-ID: FYKS0B15UeK
--- 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']: