Bug 1446954: Remove support for running tests on automation without stylo configurations. r=froydnj
You can still run them on a --disable-stylo build, as long as that works (presumably not for long). I think I haven't missed anything, but please double-check. MozReview-Commit-ID: 3BIAEjgTLo5
This commit is contained in:
@@ -69,11 +69,6 @@ WINDOWS_WORKER_TYPES = {
|
||||
'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
|
||||
'hardware': 'releng-hardware/gecko-t-win7-32-hw',
|
||||
},
|
||||
'windows7-32-stylo-disabled': {
|
||||
'virtual': 'aws-provisioner-v1/gecko-t-win7-32',
|
||||
'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
|
||||
'hardware': 'releng-hardware/gecko-t-win7-32-hw',
|
||||
},
|
||||
'windows10-64': {
|
||||
'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
|
||||
'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
|
||||
@@ -99,11 +94,6 @@ WINDOWS_WORKER_TYPES = {
|
||||
'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
|
||||
'hardware': 'releng-hardware/gecko-t-win10-64-hw',
|
||||
},
|
||||
'windows10-64-stylo-disabled': {
|
||||
'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
|
||||
'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
|
||||
'hardware': 'releng-hardware/gecko-t-win10-64-hw',
|
||||
},
|
||||
'windows10-64-asan': {
|
||||
'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
|
||||
'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
|
||||
@@ -551,18 +541,8 @@ def set_treeherder_machine_platform(config, tests):
|
||||
'android-api-16-gradle/opt': 'android-api-16-gradle/opt',
|
||||
}
|
||||
for test in tests:
|
||||
# For most desktop platforms, the above table is not used for "regular"
|
||||
# builds, so we'll always pick the test platform here.
|
||||
# On macOS though, the regular builds are in the table. This causes a
|
||||
# conflict in `verify_task_graph_symbol` once you add a new test
|
||||
# platform based on regular macOS builds, such as for Stylo.
|
||||
# Since it's unclear if the regular macOS builds can be removed from
|
||||
# the table, workaround the issue for Stylo.
|
||||
if '-stylo-disabled' in test['test-platform']:
|
||||
test['treeherder-machine-platform'] = test['test-platform']
|
||||
else:
|
||||
test['treeherder-machine-platform'] = translation.get(
|
||||
test['build-platform'], test['test-platform'])
|
||||
test['treeherder-machine-platform'] = translation.get(
|
||||
test['build-platform'], test['test-platform'])
|
||||
yield test
|
||||
|
||||
|
||||
@@ -580,36 +560,26 @@ def set_tier(config, tests):
|
||||
'linux32/debug',
|
||||
'linux32-nightly/opt',
|
||||
'linux32-devedition/opt',
|
||||
'linux32-stylo-disabled/debug',
|
||||
'linux32-stylo-disabled/opt',
|
||||
'linux64/opt',
|
||||
'linux64-nightly/opt',
|
||||
'linux64/debug',
|
||||
'linux64-pgo/opt',
|
||||
'linux64-devedition/opt',
|
||||
'linux64-asan/opt',
|
||||
'linux64-stylo-disabled/debug',
|
||||
'linux64-stylo-disabled/opt',
|
||||
'windows7-32/debug',
|
||||
'windows7-32/opt',
|
||||
'windows7-32-pgo/opt',
|
||||
'windows7-32-devedition/opt',
|
||||
'windows7-32-nightly/opt',
|
||||
'windows7-32-stylo-disabled/debug',
|
||||
'windows7-32-stylo-disabled/opt',
|
||||
'windows10-64/debug',
|
||||
'windows10-64/opt',
|
||||
'windows10-64-pgo/opt',
|
||||
'windows10-64-devedition/opt',
|
||||
'windows10-64-nightly/opt',
|
||||
'windows10-64-stylo-disabled/debug',
|
||||
'windows10-64-stylo-disabled/opt',
|
||||
'macosx64/opt',
|
||||
'macosx64/debug',
|
||||
'macosx64-nightly/opt',
|
||||
'macosx64-devedition/opt',
|
||||
'macosx64-stylo-disabled/debug',
|
||||
'macosx64-stylo-disabled/opt',
|
||||
'android-4.3-arm7-api-16/opt',
|
||||
'android-4.3-arm7-api-16/debug',
|
||||
'android-4.2-x86/opt']:
|
||||
@@ -889,21 +859,6 @@ def set_test_type(config, tests):
|
||||
yield test
|
||||
|
||||
|
||||
@transforms.add
|
||||
def disable_stylo(config, tests):
|
||||
"""
|
||||
Disable Stylo for all jobs on `-stylo-disabled` platforms.
|
||||
"""
|
||||
for test in tests:
|
||||
if '-stylo-disabled' not in test['test-platform']:
|
||||
yield test
|
||||
continue
|
||||
|
||||
test['mozharness'].setdefault('extra-options', []).append('--disable-stylo')
|
||||
|
||||
yield test
|
||||
|
||||
|
||||
@transforms.add
|
||||
def single_stylo_traversal_tests(config, tests):
|
||||
"""Enable single traversal for all tests on the sequential Stylo platform."""
|
||||
|
||||
Reference in New Issue
Block a user