From 11eedd07feafaa6e555deaa39c3ed0a31c865f28 Mon Sep 17 00:00:00 2001 From: Ciure Andrei Date: Mon, 6 Jan 2020 19:13:04 +0200 Subject: [PATCH] Backed out changeset 1410db0871ba (bug 1599197) for causing linting failures CLOSED TREE --- taskcluster/ci/build/linux.yml | 1 - taskcluster/ci/spidermonkey/linux.yml | 1 - taskcluster/ci/test/web-platform.yml | 1 - taskcluster/taskgraph/transforms/tests.py | 106 +++++++++++----------- tools/tryselect/selectors/fuzzy.py | 1 - 5 files changed, 55 insertions(+), 55 deletions(-) diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml index 26b6c7f8e3d7..a9b0847bc15a 100644 --- a/taskcluster/ci/build/linux.yml +++ b/taskcluster/ci/build/linux.yml @@ -622,7 +622,6 @@ linux-shippable/opt: secrets: true tooltool-downloads: public need-xvfb: true - run-on-projects: ['mozilla-central', 'try'] fetches: toolchain: - linux64-binutils diff --git a/taskcluster/ci/spidermonkey/linux.yml b/taskcluster/ci/spidermonkey/linux.yml index ec84f3c728c9..fe5d7a93da1f 100644 --- a/taskcluster/ci/spidermonkey/linux.yml +++ b/taskcluster/ci/spidermonkey/linux.yml @@ -90,7 +90,6 @@ sm-arm-sim-linux32/debug: docker-image: {in-tree: debian7-i386-build} run: spidermonkey-variant: arm-sim - run-on-projects: ['mozilla-central', 'try'] sm-arm64-sim-linux64/debug: description: "Spidermonkey ARM64 sim" diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml index acd8ad61bda9..4244ac81d009 100644 --- a/taskcluster/ci/test/web-platform.yml +++ b/taskcluster/ci/test/web-platform.yml @@ -66,7 +66,6 @@ web-platform-tests: run-on-projects: by-test-platform: windows10-aarch64/opt: ['try', 'mozilla-central'] - linux1804-32-shippable/opt: ['try', 'mozilla-central'] .*-qr/.*: ['release', 'try'] # skip on integration branches due to high load default: built-projects tier: diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py index c3fb0af7e7bf..a172350c79a2 100644 --- a/taskcluster/taskgraph/transforms/tests.py +++ b/taskcluster/taskgraph/transforms/tests.py @@ -813,57 +813,61 @@ def set_tier(config, tests): # only override if not set for the test if 'tier' not in test or test['tier'] == 'default': - if test['test-platform'] in [ - 'linux64/opt', - 'linux64-nightly/opt', - 'linux64/debug', - 'linux64-pgo/opt', - 'linux64-shippable/opt', - 'linux64-devedition/opt', - 'linux64-asan/opt', - 'linux64-qr/opt', - 'linux64-qr/debug', - 'linux64-pgo-qr/opt', - 'linux64-shippable-qr/opt', - 'linux1804-64/opt', - 'linux1804-64/debug', - 'linux1804-64-shippable/opt', - 'linux1804-64-qr/opt', - 'linux1804-64-qr/debug', - 'linux1804-64-shippable-qr/opt', - 'linux1804-64-asan/opt', - 'windows7-32/debug', - 'windows7-32/opt', - 'windows7-32-pgo/opt', - 'windows7-32-devedition/opt', - 'windows7-32-nightly/opt', - 'windows7-32-shippable/opt', - 'windows10-aarch64/opt', - 'windows10-64/debug', - 'windows10-64/opt', - 'windows10-64-pgo/opt', - 'windows10-64-shippable/opt', - 'windows10-64-devedition/opt', - 'windows10-64-nightly/opt', - 'windows10-64-asan/opt', - 'windows10-64-qr/opt', - 'windows10-64-qr/debug', - 'windows10-64-pgo-qr/opt', - 'windows10-64-shippable-qr/opt', - 'macosx1014-64/opt', - 'macosx1014-64/debug', - 'macosx1014-64-nightly/opt', - 'macosx1014-64-shippable/opt', - 'macosx1014-64-devedition/opt', - 'macosx1014-64-qr/opt', - 'macosx1014-64-shippable-qr/opt', - 'macosx1014-64-qr/debug', - 'android-em-7.0-x86_64/opt', - 'android-em-7.0-x86_64/debug', - 'android-em-7.0-x86/opt', - 'android-em-7.0-x86_64-qr/opt', - 'android-em-7.0-x86_64-qr/debug' - ]: + if test['test-platform'] in ['linux32/opt', + 'linux32/debug', + 'linux32-nightly/opt', + 'linux32-devedition/opt', + 'linux32-shippable/opt', + 'linux64/opt', + 'linux64-nightly/opt', + 'linux64/debug', + 'linux64-pgo/opt', + 'linux64-shippable/opt', + 'linux64-devedition/opt', + 'linux64-asan/opt', + 'linux64-qr/opt', + 'linux64-qr/debug', + 'linux64-pgo-qr/opt', + 'linux64-shippable-qr/opt', + 'linux1804-32-shippable/opt', + 'linux1804-64/opt', + 'linux1804-64/debug', + 'linux1804-64-shippable/opt', + 'linux1804-64-qr/opt', + 'linux1804-64-qr/debug', + 'linux1804-64-shippable-qr/opt', + 'linux1804-64-asan/opt', + 'windows7-32/debug', + 'windows7-32/opt', + 'windows7-32-pgo/opt', + 'windows7-32-devedition/opt', + 'windows7-32-nightly/opt', + 'windows7-32-shippable/opt', + 'windows10-aarch64/opt', + 'windows10-64/debug', + 'windows10-64/opt', + 'windows10-64-pgo/opt', + 'windows10-64-shippable/opt', + 'windows10-64-devedition/opt', + 'windows10-64-nightly/opt', + 'windows10-64-asan/opt', + 'windows10-64-qr/opt', + 'windows10-64-qr/debug', + 'windows10-64-pgo-qr/opt', + 'windows10-64-shippable-qr/opt', + 'macosx1014-64/opt', + 'macosx1014-64/debug', + 'macosx1014-64-nightly/opt', + 'macosx1014-64-shippable/opt', + 'macosx1014-64-devedition/opt', + 'macosx1014-64-qr/opt', + 'macosx1014-64-shippable-qr/opt', + 'macosx1014-64-qr/debug', + 'android-em-7.0-x86_64/opt', + 'android-em-7.0-x86_64/debug', + 'android-em-7.0-x86/opt', + 'android-em-7.0-x86_64-qr/opt', + 'android-em-7.0-x86_64-qr/debug']: test['tier'] = 1 else: test['tier'] = 2 diff --git a/tools/tryselect/selectors/fuzzy.py b/tools/tryselect/selectors/fuzzy.py index 7b2480d7a340..7754910e9e68 100644 --- a/tools/tryselect/selectors/fuzzy.py +++ b/tools/tryselect/selectors/fuzzy.py @@ -46,7 +46,6 @@ TARGET_TASK_FILTERS = ( '.*win64-aarch64-laptop.*', 'android-hw.*', '.*android-geckoview-docs.*', - 'linux1804-32.*', # Bug 1599197 )