Backed out 5 changesets (bug 1522111) for breaking windows opt wpts
authorNoemi Erli <nerli@mozilla.com>
Sat, 16 Feb 2019 00:06:17 +0200
changeset 459608 6a145b0bf8e4a9e1a227b2327f6fbbbe948fbae8
parent 459607 b99e716549211d24dcf69e9b4969b88765afdb56
child 459609 fe21a09ef43fe601d454ff07e2d172a58d215958
push id35563
push userccoroiu@mozilla.com
push dateSat, 16 Feb 2019 09:36:04 +0000
treeherdermozilla-central@1cfd69d05aa1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1522111
milestone67.0a1
backs outaa6103c8ef0ff2544a48ccd46bcca982ab15b5e8
14e9ed41b8be248a724c89c6c664f569e20acf05
c10783ea070ba234b350e63762df4c89af06204e
cc97d772a8db8e54197250fd585ab3863b920542
6fbfc8bc2388a3ee3d7c18fd20fe5e87670bb26f
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 5 changesets (bug 1522111) for breaking windows opt wpts Backed out changeset aa6103c8ef0f (bug 1522111) Backed out changeset 14e9ed41b8be (bug 1522111) Backed out changeset c10783ea070b (bug 1522111) Backed out changeset cc97d772a8db (bug 1522111) Backed out changeset 6fbfc8bc2388 (bug 1522111)
taskcluster/ci/build/linux.yml
taskcluster/ci/build/windows.yml
taskcluster/ci/l10n/kind.yml
taskcluster/ci/repackage-signing/kind.yml
taskcluster/ci/repackage/kind.yml
taskcluster/ci/source-test/kind.yml
taskcluster/ci/test/misc.yml
taskcluster/ci/test/mochitest.yml
taskcluster/ci/test/raptor.yml
taskcluster/ci/test/talos.yml
taskcluster/ci/test/test-platforms.yml
taskcluster/ci/test/web-platform.yml
taskcluster/taskgraph/loader/build_signing.py
taskcluster/taskgraph/transforms/l10n.py
taskcluster/taskgraph/transforms/repackage.py
taskcluster/taskgraph/transforms/repackage_signing.py
taskcluster/taskgraph/transforms/tests.py
taskcluster/taskgraph/util/seta.py
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -16,17 +16,16 @@ linux64/opt:
         actions: [get-secrets, build, check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         tooltool-downloads: public
         need-xvfb: true
-    run-on-projects: ['mozilla-central', 'try']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
         - linux64-node
@@ -51,17 +50,17 @@ linux64-plain/opt:
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         script: mozharness/scripts/fx_desktop_build.py
         tooltool-downloads: public
         extra-config:
             disable_package_metrics: true
         mozconfig-variant: plain-opt
-    run-on-projects: ['mozilla-central', 'try']
+    run-on-projects: [trunk]
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-node
         - linux64-cbindgen
 
 linux64/pgo:
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -57,17 +57,16 @@ win32/opt:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/releng_base_firefox.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
         extra-config:
             stage_platform: win32
-    run-on-projects: ['mozilla-central', 'try']
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-nasm
         - win64-node
@@ -197,17 +196,17 @@ win64-plain/debug:
         config:
             - builds/releng_base_firefox.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
         extra-config:
             disable_package_metrics: true
             stage_platform: win64
         mozconfig-variant: plain-debug
-    run-on-projects: ['trunk']
+    run-on-projects: [trunk]
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-node
         - win64-nasm
         - win64-cbindgen
 
 win64/opt:
@@ -230,17 +229,16 @@ win64/opt:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/releng_base_firefox.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
         extra-config:
             stage_platform: win64
-    run-on-projects: ['mozilla-central', 'try']
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-nasm
         - win64-node
@@ -267,17 +265,17 @@ win64-plain/opt:
         config:
             - builds/releng_base_firefox.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
         extra-config:
             disable_package_metrics: true
             stage_platform: win64
         mozconfig-variant: plain-opt
-    run-on-projects: ['mozilla-central', 'try']
+    run-on-projects: [trunk]
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-nasm
         - win64-node
         - win64-cbindgen
 
 win32-nightly/opt:
@@ -420,17 +418,17 @@ win32-add-on-devel/opt:
         script: "mozharness/scripts/fx_desktop_build.py"
         config:
             - builds/releng_base_firefox.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
         extra-config:
             stage_platform: win32-add-on-devel
         mozconfig-variant: add-on-devel
-    run-on-projects: ['mozilla-beta', 'mozilla-release']
+    run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45']
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-nasm
         - win64-node
@@ -454,17 +452,17 @@ win64-add-on-devel/opt:
         script: "mozharness/scripts/fx_desktop_build.py"
         config:
             - builds/releng_base_firefox.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
         extra-config:
             stage_platform: win64-on-devel
         mozconfig-variant: add-on-devel
-    run-on-projects: ['mozilla-beta', 'mozilla-release']
+    run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45']
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-sccache
         - win64-nasm
         - win64-node
--- a/taskcluster/ci/l10n/kind.yml
+++ b/taskcluster/ci/l10n/kind.yml
@@ -17,22 +17,22 @@ kind-dependencies:
     - build-signing
     - repackage
     - repackage-signing
     - toolchain
 
 primary-dependency: build
 
 only-for-build-platforms:
-    - linux64-pgo/opt
+    - linux64/opt
     - linux/opt
     - android-api-16/opt
     - macosx64/opt
-    - win32-pgo/opt
-    - win64-pgo/opt
+    - win32/opt
+    - win64/opt
 
 job-template:
     description:
         by-build-platform:
             default: Localization
             android-api-16: Single Locale Repack
     locales-file:
         by-build-platform:
@@ -73,43 +73,40 @@ job-template:
         type: l10n
         product:
             by-build-platform:
                 default: firefox
                 android-api-16: mobile
         job-name:
             by-build-platform:
                 linux: linux-opt
-                linux64.*: linux64-opt
+                linux64: linux64-opt
                 macosx64: macosx64-opt
-                win32.*: win32-opt
-                win64.*: win64-opt
+                win32: win32-opt
+                win64: win64-opt
                 android-api-16: android-api-16-opt
     run-on-projects: ['all']
     worker-type:
         by-build-platform:
             default: aws-provisioner-v1/gecko-{level}-b-linux
             android-api-16: aws-provisioner-v1/gecko-{level}-b-android
             win.*: aws-provisioner-v1/gecko-{level}-b-win2012
     treeherder:
         symbol: L10n
         tier:
             by-build-platform:
                 default: 1
                 android-api-16: 2
         platform:
             by-build-platform:
                 linux64: linux64/opt
-                linux64-pgo: linux64-pgo/opt
                 linux: linux32/opt
                 macosx64: osx-cross/opt
                 win32: windows2012-32/opt
-                win32-pgo: windows2012-32-pgo/opt
                 win64: windows2012-64/opt
-                win64-pgo: windows2012-64-pgo/opt
                 android-api-16: android-4-0-armv7-api16/opt
     env:
         by-build-platform:
             linux.*:    # linux64 and 32 get same treatment here
                 EN_US_PACKAGE_NAME: target.tar.bz2
                 EN_US_BINARY_URL:
                     artifact-reference: <build-signing/{artifact_prefix}>
             macosx64:
@@ -129,32 +126,32 @@ job-template:
     mozharness:
         config:
             by-build-platform:
                 linux:
                     - single_locale/firefox.py
                     - single_locale/linux32.py
                     - single_locale/tc_common.py
                     - single_locale/tc_linux_common.py
-                linux64.*:
+                linux64:
                     - single_locale/firefox.py
                     - single_locale/linux64.py
                     - single_locale/tc_common.py
                     - single_locale/tc_linux_common.py
                 macosx64:
                     - single_locale/firefox.py
                     - single_locale/macosx64.py
                     - single_locale/tc_common.py
                     - single_locale/tc_macosx64.py
-                win32.*:
+                win32:
                     - single_locale/firefox.py
                     - single_locale/win32.py
                     - single_locale/tc_common.py
                     - single_locale/tc_win32.py
-                win64.*:
+                win64:
                     - single_locale/firefox.py
                     - single_locale/win64.py
                     - single_locale/tc_common.py
                     - single_locale/tc_win64.py
                 android-api-16:
                     - single_locale/tc_common.py
                     - single_locale/tc_android-api-16.py
         # no default, so we fail on new entries
--- a/taskcluster/ci/repackage-signing/kind.yml
+++ b/taskcluster/ci/repackage-signing/kind.yml
@@ -11,14 +11,14 @@ transforms:
    - taskgraph.transforms.task:transforms
 
 kind-dependencies:
    - repackage
 
 only-for-build-platforms:
    - win32-nightly/opt
    - win32-devedition-nightly/opt
-   - win32-pgo/opt
+   - win32/opt
    - win64-nightly/opt
    - win64-devedition-nightly/opt
-   - win64-pgo/opt
+   - win64/opt
    - win64-aarch64-nightly/opt
    - win64-asan-reporter-nightly/opt
--- a/taskcluster/ci/repackage/kind.yml
+++ b/taskcluster/ci/repackage/kind.yml
@@ -19,29 +19,26 @@ kind-dependencies:
 only-for-build-platforms:
     - linux-nightly/opt
     - linux-devedition-nightly/opt
     - linux/opt
     - linux64-nightly/opt
     - linux64-devedition-nightly/opt
     - linux64-asan-reporter-nightly/opt
     - linux64/opt
-    - linux64-pgo/opt
     - macosx64-nightly/opt
     - macosx64-devedition-nightly/opt
     - macosx64/opt
     - win32-nightly/opt
     - win32-devedition-nightly/opt
     - win32/opt
-    - win32-pgo/opt
     - win64-nightly/opt
     - win64-devedition-nightly/opt
     - win64-aarch64-nightly/opt
     - win64/opt
-    - win64-pgo/opt
     - win64-asan-reporter-nightly/opt
 
 job-template:
     mozharness:
         config:
             by-build-platform:
                 linux\b.*:
                     - repackage/base.py
--- a/taskcluster/ci/source-test/kind.yml
+++ b/taskcluster/ci/source-test/kind.yml
@@ -25,9 +25,9 @@ jobs-from:
    - webidl.yml
    - wpt-manifest.yml
 
 # This is used by run-task based tasks to lookup which build task it
 # should depend on based on its own platform.
 dependent-build-platforms:
    linux64-asan/opt: build-linux64-asan/opt
    linux64/debug: build-linux64/debug
-   linux64.*: build-linux64/pgo
+   linux64.*: build-linux64/opt
--- a/taskcluster/ci/test/misc.yml
+++ b/taskcluster/ci/test/misc.yml
@@ -75,17 +75,16 @@ test-verify:
             default: default
     max-run-time: 10800
     allow-software-gl-layers: false
     run-on-projects:
         by-test-platform:
             # do not run on ccov
             .*-ccov/.*: []
             .*-asan/.*: []
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
             # do not run on beta or release: usually just confirms earlier results
             default: ['trunk', 'try']
     tier: 2
     mozharness:
         script:
             by-test-platform:
                 android-em.*: android_emulator_unittest.py
                 default: desktop_unittest.py
@@ -119,17 +118,16 @@ test-verify-gpu:
             default: default
     max-run-time: 10800
     allow-software-gl-layers: false
     run-on-projects:
         by-test-platform:
             # do not run on ccov
             .*-ccov/.*: []
             .*-asan/.*: []
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
             # do not run on beta or release: usually just confirms earlier results
             default: ['trunk', 'try']
     tier: 2
     mozharness:
         script:
             by-test-platform:
                 android-em.*: android_emulator_unittest.py
                 default: desktop_unittest.py
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -133,20 +133,19 @@ browser-instrumentation:
 browser-screenshots:
     description: "Browser Screenshots"
     suite: mochitest/browser-chrome-screenshots
     treeherder-symbol: M(ss)
     loopback-video: true
     run-on-projects:
         by-test-platform:
             # We don't want debug, pgo, devedition or nightly builds
-            windows7-32-pgo(?:-qr)?/opt: ['mozilla-central', 'integration']
-            windows10-64-pgo(?:-qr)?/opt: ['mozilla-central', 'integration']
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central']
-            linux64-pgo(?:-qr)?/opt: ['mozilla-central', 'integration']
+            windows7-32/opt: ['mozilla-central', 'integration']
+            windows10-64/opt: ['mozilla-central', 'integration']
+            linux64/opt: ['mozilla-central', 'integration']
             macosx64/opt: ['mozilla-central', 'integration']
             default: []
     max-run-time: 3600
     mozharness:
         mochitest-flavor: browser
     allow-software-gl-layers: false
 
 mochitest-chrome:
--- a/taskcluster/ci/test/raptor.yml
+++ b/taskcluster/ci/test/raptor.yml
@@ -7,17 +7,16 @@ job-defaults:
     suite: raptor
     workdir:
         by-test-platform:
             android-hw.*: /builds/worker
             default: /home/cltbld
     run-on-projects:
         by-test-platform:
             windows10-64-ux: ['try', 'mozilla-central']
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
             default: ['try', 'trunk', 'mozilla-beta']
     tier:
         by-test-platform:
             windows10-64-ccov/.*: 3
             linux64-ccov/.*: 3
             android-hw-g5.*: 2
             default: 1
     virtualization:
--- a/taskcluster/ci/test/talos.yml
+++ b/taskcluster/ci/test/talos.yml
@@ -27,319 +27,261 @@ job-defaults:
 
 talos-bcv:
     description: "Talos basic compositor video"
     try-name: bcv
     treeherder-symbol: T(bcv)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: []  # this test is not useful with webrender
-            (?:windows10-64|windows7-32|linux64)/opt: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'trunk', 'try']
     tier:
         by-test-platform:
             .*-qr/.*: 3  # this should be disabled but might run via try syntax anyway, so explicitly downgrade to tier-3
             default: default
     max-run-time: 1800
     mozharness:
         extra-options:
             - --suite=bcv
 
 talos-chrome:
     description: "Talos chrome"
     try-name: chromez
     treeherder-symbol: T(c)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=chromez
 
 talos-damp:
     description: "Talos devtools (damp)"
     try-name: damp
     treeherder-symbol: T(damp)
     max-run-time: 5400
     run-on-projects:
         by-test-platform:
             linux64-ccov/.*: ['try']  # Bug 1407593
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'trunk', 'try']
     mozharness:
         extra-options:
             - --suite=damp
 
 talos-dromaeojs:
     description: "Talos dromaeojs"
     try-name: dromaeojs
     treeherder-symbol: T(d)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time: 2100
     mozharness:
         extra-options:
             - --suite=dromaeojs
 
 talos-flex:
     description: "Talos XUL flexbox emulation enabled"
     try-name: flex
     treeherder-symbol: T(f)
     tier: 3
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 1800
     mozharness:
         extra-options:
             - --suite=flex
 
 talos-g1:
     description: "Talos g1"
     try-name: g1
     treeherder-symbol: T(g1)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time:
         by-test-platform:
             linux64.*: 3600
             default: 7200
     mozharness:
         extra-options:
             - --suite=g1
 
 talos-g3:
     description: "Talos g3"
     try-name: g3
     treeherder-symbol: T(g3)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time: 900
     mozharness:
         extra-options:
             - --suite=g3
 
 talos-g4:
     description: "Talos g4"
     try-name: g4
     treeherder-symbol: T(g4)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time:
         by-test-platform:
             linux64.*: 1500
             default: 1800
     mozharness:
         extra-options:
             - --suite=g4
 
 talos-g5:
     description: "Talos g5"
     try-name: g5
     treeherder-symbol: T(g5)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     mozharness:
         extra-options:
             - --suite=g5
     max-run-time:
         by-test-platform:
             linux64.*: 1200
             default: 1800
 
 talos-h1:
     description: "Talos h1"
     try-name: h1
     treeherder-symbol: T(h1)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     mozharness:
         extra-options:
             - --suite=h1
     max-run-time:
         by-test-platform:
             linux64.*: 900
             default: 1800
 
 talos-h2:
     description: "Talos h2"
     try-name: h2
     treeherder-symbol: T(h2)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time:
         by-test-platform:
             linux64.*: 900
             default: 7200
     mozharness:
         extra-options:
             - --suite=h2
 
 talos-motionmark:
     description: "Talos motionmark"
     try-name: motionmark
     treeherder-symbol: T(mm)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     tier:
         by-test-platform:
             windows10-64-ccov/.*: 3
             linux64-ccov/.*: 3
             default: 2
     mozharness:
         extra-options:
             - --suite=motionmark
 
 talos-other:
     description: "Talos other"
     try-name: other
     treeherder-symbol: T(o)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time: 1500
     mozharness:
         extra-options:
             - --suite=other
 
 talos-sessionrestore-many-windows:
     description: "Talos sessionrestore-many-windows"
     try-name: sessionrestore-many-windows
     treeherder-symbol: T(smw)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 1500
     mozharness:
         extra-options:
             - --suite=sessionrestore-many-windows
 
 talos-perf-reftest:
     description: "Talos perf-reftest"
     try-name: perf-reftest
     treeherder-symbol: T(p)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['trunk', 'try']
+    run-on-projects: ['trunk', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=perf-reftest
 
 talos-perf-reftest-singletons:
     description: "Talos perf-reftest singletons"
     try-name: perf-reftest-singletons
     treeherder-symbol: T(ps)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['trunk', 'try']
+    run-on-projects: ['trunk', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=perf-reftest-singletons
 
 talos-speedometer:
     description: "Talos speedometer"
     try-name: speedometer
     treeherder-symbol: T(sp)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time: 1500
     mozharness:
         extra-options:
             - --suite=speedometer
 
 talos-svgr:
     description: "Talos svgr"
     try-name: svgr
     treeherder-symbol: T(s)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time: 1800
     mozharness:
         extra-options:
             - --suite=svgr
 
 talos-tp5o:
     description: "Talos tp5o"
     try-name: tp5o
     treeherder-symbol: T(tp)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time: 1800
     mozharness:
         extra-options:
             - --suite=tp5o
 
 talos-tp6:
     description: "Talos tp6"
     try-name: tp6
     treeherder-symbol: T(tp6)
-    run-on-projects:
-        by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
-            default: ['trunk', 'try']
+    run-on-projects: ['trunk', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=tp6
 
 talos-tp6-stylo-threads:
     description: "Talos Stylo sequential tp6"
     try-name: tp6-stylo-threads
     treeherder-symbol: Tss(tp6)
     max-run-time: 1200
     run-on-projects:
         by-test-platform:
             macosx.*: ['mozilla-beta', 'autoland', 'try']
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'trunk', 'try']
     mozharness:
         extra-options:
             - --suite=tp6-stylo-threads
 
 talos-tps:
     description: "Talos page scroll (tps)"
     try-name: tps
     treeherder-symbol: T(tps)
     max-run-time: 900
     run-on-projects:
         by-test-platform:
             linux64-ccov/.*: ['try']  # Bug 1407593
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'trunk', 'try']
     mozharness:
         extra-options:
             - --suite=tps
 
 talos-xperf:
     description: "Talos xperf"
     try-name: xperf
@@ -348,20 +290,19 @@ talos-xperf:
     os-groups: ['Administrators']
     run-as-administrator:
         by-test-platform:
             windows7-32.*: false
             windows10-aarch64.*: false
             windows10-64.*: true
     run-on-projects:
         by-test-platform:
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
+            windows7-32(-pgo)?/.*: ['mozilla-beta', 'trunk', 'try']
             windows10-aarch64/opt: []
-            windows7-32-pgo(?:-qr)?/.*: ['mozilla-beta', 'trunk', 'try']
-            windows10-64-(?!qr).*/opt: ['mozilla-beta', 'trunk', 'try']
+            windows10-64.*/opt: ['mozilla-beta', 'trunk', 'try']
             default: []
     tier:
         by-test-platform:
             windows7-32.*: default
             windows10-64(-pgo)?/.*: default
             windows10-64-ccov/debug: 3
             default: 3  # this should be disabled but might run via try syntax anyway, so explicitly downgrade to tier-3
     mozharness:
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -75,22 +75,17 @@ linux64-devedition/opt:
         - desktop-screenshot-capture
 
 # TODO: use 'pgo' and 'asan' labels here, instead of -pgo/opt
 linux64-pgo/opt:
     build-platform: linux64-pgo/opt
     test-sets:
         - common-tests
         - web-platform-tests
-        - opt-only-tests
-        - desktop-screenshot-capture
         - talos
-        - awsy
-        - mochitest-headless
-        - linux-talos-flex
         - raptor-firefox
         - raptor-fetch-firefox
 
 linux64-asan/opt:
     build-platform: linux64-asan/opt
     test-sets:
         - common-tests
         - web-platform-tests
@@ -106,25 +101,16 @@ linux64-qr/opt:
     build-platform: linux64/opt
     test-sets:
         - linux-qr-tests
         - talos
         - awsy
         - web-platform-tests
         - raptor-firefox
         - raptor-fetch-firefox
-linux64-pgo-qr/opt:
-    build-platform: linux64-pgo/opt
-    test-sets:
-        - linux-qr-tests
-        - talos
-        - awsy
-        - web-platform-tests
-        - raptor-firefox
-        - raptor-fetch-firefox
 linux64-qr/debug:
     build-platform: linux64/debug
     test-sets:
         - linux-qr-tests
         - web-platform-tests
 
 linux64-ccov/debug:
     build-platform: linux64-ccov/debug
@@ -237,21 +223,21 @@ windows10-64-ux/opt:
         - raptor-firefox
         - talos-ux
 
 windows10-64-pgo/opt:
     build-platform: win64-pgo/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
+        - marionette-gpu-tests
         - windows-talos
         - marionette-gpu-tests
         - windows-tests
         - web-platform-tests
-        - mochitest-headless
         - raptor-firefox
 
 windows10-64-nightly/opt:
     build-platform: win64-nightly/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - desktop-instrumentation
@@ -285,25 +271,16 @@ windows10-64-qr/opt:
     build-platform: win64/opt
     test-sets:
         - awsy
         - windows-qr-tests
         - windows-talos
         - raptor-firefox
         - web-platform-tests
 
-windows10-64-pgo-qr/opt:
-    build-platform: win64-pgo/opt
-    test-sets:
-        - awsy
-        - windows-qr-tests
-        - windows-talos
-        - raptor-firefox
-        - web-platform-tests
-
 ##
 # MacOS X platforms (matching /macosx.*/)
 
 macosx64/debug:
     build-platform: macosx64/debug
     test-sets:
         - macosx64-tests
 
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -187,17 +187,16 @@ test-verify-wpt:
     suite: test-verify
     treeherder-symbol: TVw
     max-run-time: 10800
     run-on-projects:
         by-test-platform:
             # do not run on ccov
             .*-ccov/.*: []
             .*-asan/.*: []
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
             # do not run on beta or release: usually just confirms earlier results
             default: ['trunk', 'try']
     tier: 2
     mozharness:
         extra-options:
             - --verify
 
 test-coverage-wpt:
--- a/taskcluster/taskgraph/loader/build_signing.py
+++ b/taskcluster/taskgraph/loader/build_signing.py
@@ -8,18 +8,17 @@ from taskgraph.loader.single_dep import 
 
 # XXX: This logic should rely in kind.yml. This hasn't been done in the original
 # patch because it required some heavy changes in single_dep.
 NON_NIGHTLY_LABELS_WHICH_SHOULD_SIGN_BUILDS = (
     'build-win32/debug', 'build-win32/opt', 'build-win32/pgo',
     'build-win64/debug', 'build-win64/opt', 'build-win64/pgo',
     'build-win32-devedition/opt', 'build-win64-devedition/opt',
     'build-win64-ccov/debug',
-    'build-linux/opt', 'build-linux64/opt', 'build-linux64/pgo',
-    'build-macosx64/opt',
+    'build-linux/opt', 'build-linux64/opt', 'build-macosx64/opt',
     'build-android-api-16/opt'
     'release-source-linux64-source/opt',
     'release-source-linux64-fennec-source/opt',
     'release-source-linux64-devedition-source/opt',
     'release-eme-free-repack-macosx64-nightly',
     'release-partner-repack-macosx64-nightly',
 )
 
--- a/taskcluster/taskgraph/transforms/l10n.py
+++ b/taskcluster/taskgraph/transforms/l10n.py
@@ -277,17 +277,16 @@ def handle_artifact_prefix(config, jobs)
                     )
         yield job
 
 
 @transforms.add
 def all_locales_attribute(config, jobs):
     for job in jobs:
         locales_platform = job['attributes']['build_platform'].replace("-nightly", "")
-        locales_platform = locales_platform.replace("-pgo", "")
         locales_with_changesets = parse_locales_file(job["locales-file"],
                                                      platform=locales_platform)
         locales_with_changesets = _remove_locales(locales_with_changesets,
                                                   to_remove=job['ignore-locales'])
 
         locales = sorted(locales_with_changesets.keys())
         attributes = job.setdefault('attributes', {})
         attributes["all_locales"] = locales
--- a/taskcluster/taskgraph/transforms/repackage.py
+++ b/taskcluster/taskgraph/transforms/repackage.py
@@ -217,17 +217,18 @@ def make_job_description(config, jobs):
         if locale:
             attributes['locale'] = locale
 
         treeherder = job.get('treeherder', {})
         if attributes.get('nightly'):
             treeherder.setdefault('symbol', 'Nr')
         else:
             treeherder.setdefault('symbol', 'Rpk')
-        dep_th_platform = dep_job.task.get('extra', {}).get('treeherder-platform')
+        dep_th_platform = dep_job.task.get('extra', {}).get(
+            'treeherder', {}).get('machine', {}).get('platform', '')
         treeherder.setdefault('platform', "{}/opt".format(dep_th_platform))
         treeherder.setdefault('tier', 1)
         treeherder.setdefault('kind', 'build')
 
         if config.kind == 'repackage-msi':
             treeherder['symbol'] = 'MSI({})'.format(locale or 'N')
 
         build_task = None
--- a/taskcluster/taskgraph/transforms/repackage_signing.py
+++ b/taskcluster/taskgraph/transforms/repackage_signing.py
@@ -46,17 +46,18 @@ def make_repackage_signing_description(c
         locale = attributes.get('locale', dep_job.attributes.get('locale'))
         attributes['repackage_type'] = 'repackage-signing'
 
         treeherder = job.get('treeherder', {})
         if attributes.get('nightly'):
             treeherder.setdefault('symbol', 'rs(N)')
         else:
             treeherder.setdefault('symbol', 'rs(B)')
-        dep_th_platform = dep_job.task.get('extra', {}).get('treeherder-platform')
+        dep_th_platform = dep_job.task.get('extra', {}).get(
+            'treeherder', {}).get('machine', {}).get('platform', '')
         treeherder.setdefault('platform',
                               "{}/opt".format(dep_th_platform))
         treeherder.setdefault(
             'tier',
             dep_job.task.get('extra', {}).get('treeherder', {}).get('tier', 1)
             )
         treeherder.setdefault('kind', 'build')
 
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -107,21 +107,16 @@ WINDOWS_WORKER_TYPES = {
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
       'hardware': 'releng-hardware/gecko-t-win10-64-hw',
     },
     'windows10-64-qr': {
       '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-pgo-qr': {
-      '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-ux': {
       '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-ux',
     },
 }
 
 # os x worker types keyed by test-platform
@@ -645,32 +640,30 @@ def set_tier(config, tests):
                                          'linux64/opt',
                                          'linux64-nightly/opt',
                                          'linux64/debug',
                                          'linux64-pgo/opt',
                                          'linux64-devedition/opt',
                                          'linux64-asan/opt',
                                          'linux64-qr/opt',
                                          'linux64-qr/debug',
-                                         'linux64-pgo-qr/opt',
                                          'windows7-32/debug',
                                          'windows7-32/opt',
                                          'windows7-32-pgo/opt',
                                          'windows7-32-devedition/opt',
                                          'windows7-32-nightly/opt',
                                          'windows10-aarch64/opt',
                                          'windows10-64/debug',
                                          'windows10-64/opt',
                                          'windows10-64-pgo/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',
                                          'macosx64/opt',
                                          'macosx64/debug',
                                          'macosx64-nightly/opt',
                                          'macosx64-devedition/opt',
                                          'macosx64-qr/opt',
                                          'macosx64-qr/debug',
                                          'android-em-4.3-arm7-api-16/opt',
                                          'android-em-4.3-arm7-api-16/debug',
--- a/taskcluster/taskgraph/util/seta.py
+++ b/taskcluster/taskgraph/util/seta.py
@@ -71,37 +71,18 @@ class SETA(object):
             if type(task_list) == dict and len(task_list) > 0:
                 if type(task_list.values()[0]) == list and len(task_list.values()[0]) > 0:
                     low_value_tasks = task_list.values()[0]
                     # bb job types return a list instead of a single string,
                     # convert to a single string to match tc tasks format
                     if type(low_value_tasks[0]) == list:
                         low_value_tasks = [self._get_task_string(x) for x in low_value_tasks]
 
-            # hack seta tasks to run 'opt' jobs on 'pgo' builds - see Bug 1522111
-            def opt_to_pgo(label):
-                opt = ['test-windows10-64/opt',
-                       'test-windows7-32/opt',
-                       'test-linux64/opt',
-                       'test-windows10-64-qr/opt',
-                       'test-windows7-32-qr/opt',
-                       'test-linux64-qr/opt']
-                pgo = ['test-windows10-64-pgo/opt',
-                       'test-windows7-32-pgo/opt',
-                       'test-linux64-pgo/opt',
-                       'test-windows10-64-pgo-qr/opt',
-                       'test-windows7-32-pgo-qr/opt',
-                       'test-linux64-pgo-qr/opt']
-                for iter in range(0, len(opt)):
-                    if label.startswith(opt[iter]):
-                        label = label.replace(opt[iter], pgo[iter])
-                return label
-
             # ensure no build tasks slipped in, we never want to optimize out those
-            low_value_tasks = [opt_to_pgo(x) for x in low_value_tasks if 'build' not in x]
+            low_value_tasks = [x for x in low_value_tasks if 'build' not in x.lower()]
 
         # In the event of request times out, requests will raise a TimeoutError.
         except exceptions.Timeout:
             logger.warning("SETA timeout, we will treat all test tasks as high value.")
 
         # In the event of a network problem (e.g. DNS failure, refused connection, etc),
         # requests will raise a ConnectionError.
         except exceptions.ConnectionError: