Bug 1552503 - disable parallel gcp builds on m-c, m-i, autoland r=wcosta
authorRob Thijssen <rthijssen@mozilla.com>
Sat, 18 May 2019 09:52:53 +0000
changeset 474428 9fc0f690af5abfa8245d078f9c92099b3ca42bdf
parent 474427 384bf576abc4732259092d43f2e02d0036168537
child 474429 2519b62544a9dae3fb29c59294420498ca637f8f
push id113153
push userapavel@mozilla.com
push dateSat, 18 May 2019 21:48:51 +0000
treeherdermozilla-inbound@e013f1f17109 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswcosta
bugs1552503
milestone68.0a1
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
Bug 1552503 - disable parallel gcp builds on m-c, m-i, autoland r=wcosta we're looking to reduce costs on infra. as parallel gcp builds have served their purpose of demonstrating they are possible and valid, we'd now like to disable them until a later date. Differential Revision: https://phabricator.services.mozilla.com/D31655
taskcluster/ci/build/android.yml
taskcluster/ci/build/linux.yml
taskcluster/ci/build/macosx.yml
taskcluster/ci/build/windows.yml
taskcluster/taskgraph/util/workertypes.py
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -834,407 +834,8 @@ android-x86_64/debug:
         - android-sdk-linux
         - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
         - linux64-nasm
         - linux64-node
-
-android-api-16-gcp/debug:
-    description: "Android 4.0 api-16+ Debug - built on GCP"
-    index:
-        product: mobile
-        job-name: android-api-16-gcp-debug
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: android-4-0-armv7-api16/debug
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        docker-image: {in-tree: android-build}
-        max-run-time: 7200
-        env:
-            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
-            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-        artifacts:
-            - name: public/android/maven
-              # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
-              type: directory
-            - name: public/build/target.maven.zip
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
-              type: file
-            - name: public/build/geckoview-androidTest.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
-              type: file
-            - name: public/build/geckoview_example.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
-              type: file
-            - name: public/build
-              path: /builds/worker/artifacts/
-              type: directory
-    run:
-        using: mozharness
-        actions: [get-secrets, build]
-        config:
-            - builds/releng_base_android_64_builds.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        custom-build-variant-cfg: api-16-debug
-        tooltool-downloads: internal
-    toolchains:
-        - android-gradle-dependencies
-        - android-ndk-linux
-        - android-sdk-linux
-        - linux64-clang
-        - linux64-rust-android
-        - linux64-rust-size
-        - linux64-cbindgen
-        - linux64-sccache
-        - linux64-nasm
-        - linux64-node
-
-android-x86-gcp/opt:
-    description: "Android 4.2 x86 Opt - built on GCP"
-    index:
-        product: mobile
-        job-name: android-x86-gcp-opt
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: android-4-2-x86/opt
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        docker-image: {in-tree: android-build}
-        max-run-time: 7200
-        env:
-            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
-            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-        artifacts:
-            - name: public/android/maven
-              # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
-              type: directory
-            - name: public/build/target.maven.zip
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
-              type: file
-            - name: public/build/geckoview-androidTest.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
-              type: file
-            - name: public/build/geckoview_example.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
-              type: file
-            - name: public/build
-              path: /builds/worker/artifacts/
-              type: directory
-    run:
-        using: mozharness
-        actions: [get-secrets, build]
-        config:
-            - builds/releng_base_android_64_builds.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        custom-build-variant-cfg: x86
-        tooltool-downloads: internal
-    toolchains:
-        - android-gradle-dependencies
-        - android-ndk-linux
-        - android-sdk-linux
-        - linux64-clang
-        - linux64-rust-android
-        - linux64-rust-size
-        - linux64-cbindgen
-        - linux64-sccache
-        - linux64-nasm
-        - linux64-node
-
-android-api-16-gcp/opt:
-    description: "Android 4.0 api-16+ Opt - built on GCP"
-    index:
-        product: mobile
-        job-name: android-api-16-gcp-opt
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: android-4-0-armv7-api16/opt
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        docker-image: {in-tree: android-build}
-        max-run-time: 7200
-        env:
-            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
-            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-        artifacts:
-            - name: public/android/maven
-              # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
-              type: directory
-            - name: public/build/target.maven.zip
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
-              type: file
-            - name: public/build/geckoview-androidTest.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
-              type: file
-            - name: public/build/geckoview_example.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
-              type: file
-            - name: public/build
-              path: /builds/worker/artifacts/
-              type: directory
-    run:
-        using: mozharness
-        actions: [get-secrets, build]
-        config:
-            - builds/releng_base_android_64_builds.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        custom-build-variant-cfg: api-16
-        tooltool-downloads: internal
-    toolchains:
-        - android-gradle-dependencies
-        - android-ndk-linux
-        - android-sdk-linux
-        - linux64-clang
-        - linux64-rust-android
-        - linux64-rust-size
-        - linux64-cbindgen
-        - linux64-sccache
-        - linux64-nasm
-        - linux64-node
-
-android-aarch64-gcp/opt:
-    description: "Android 5.0 AArch64 Opt - built on GCP"
-    index:
-        product: mobile
-        job-name: android-aarch64-gcp-opt
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: android-5-0-aarch64/opt
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        docker-image: {in-tree: android-build}
-        max-run-time: 7200
-        env:
-            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
-            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-        artifacts:
-            - name: public/android/maven
-              # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
-              type: directory
-            - name: public/build/target.maven.zip
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
-              type: file
-            - name: public/build/geckoview-androidTest.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
-              type: file
-            - name: public/build/geckoview_example.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
-              type: file
-            - name: public/build
-              path: /builds/worker/artifacts/
-              type: directory
-    run:
-        using: mozharness
-        actions: [get-secrets, build]
-        config:
-            - builds/releng_base_android_64_builds.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        custom-build-variant-cfg: aarch64
-        tooltool-downloads: internal
-    toolchains:
-        - android-gradle-dependencies
-        - android-ndk-linux
-        - android-sdk-linux
-        - linux64-clang
-        - linux64-rust-android
-        - linux64-rust-size
-        - linux64-cbindgen
-        - linux64-sccache
-        - linux64-nasm
-        - linux64-node
-
-android-aarch64-gcp/debug:
-    description: "Android 5.0 AArch64 Debug - built on GCP"
-    index:
-        product: mobile
-        job-name: android-aarch64-gcp-debug
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: android-5-0-aarch64/debug
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        docker-image: {in-tree: android-build}
-        max-run-time: 7200
-        env:
-            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
-            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-        artifacts:
-            - name: public/android/maven
-              # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
-              type: directory
-            - name: public/build/target.maven.zip
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
-              type: file
-            - name: public/build/geckoview-androidTest.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
-              type: file
-            - name: public/build/geckoview_example.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
-              type: file
-            - name: public/build
-              path: /builds/worker/artifacts/
-              type: directory
-    run:
-        using: mozharness
-        actions: [get-secrets, build]
-        config:
-            - builds/releng_base_android_64_builds.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        custom-build-variant-cfg: aarch64-debug
-        tooltool-downloads: internal
-    toolchains:
-        - android-gradle-dependencies
-        - android-ndk-linux
-        - android-sdk-linux
-        - linux64-clang
-        - linux64-rust-android
-        - linux64-rust-size
-        - linux64-cbindgen
-        - linux64-sccache
-        - linux64-nasm
-        - linux64-node
-
-android-x86_64-gcp/opt:
-    description: "Android 5.0 x86-64 Opt - built on GCP"
-    index:
-        product: mobile
-        job-name: android-x86_64-gcp-opt
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: android-5-0-x86_64/opt
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        docker-image: {in-tree: android-build}
-        max-run-time: 7200
-        env:
-            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
-            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-        artifacts:
-            - name: public/android/maven
-              # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
-              type: directory
-            - name: public/build/target.maven.zip
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
-              type: file
-            - name: public/build/geckoview-androidTest.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
-              type: file
-            - name: public/build/geckoview_example.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
-              type: file
-            - name: public/build
-              path: /builds/worker/artifacts/
-              type: directory
-    run:
-        using: mozharness
-        actions: [get-secrets, build]
-        config:
-            - builds/releng_base_android_64_builds.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        custom-build-variant-cfg: x86_64
-        tooltool-downloads: internal
-    toolchains:
-        - android-gradle-dependencies
-        - android-ndk-linux
-        - android-sdk-linux
-        - linux64-clang
-        - linux64-rust-android
-        - linux64-rust-size
-        - linux64-cbindgen
-        - linux64-sccache
-        - linux64-nasm
-        - linux64-node
-
-android-x86_64-gcp/debug:
-    description: "Android 5.0 x86-64 Debug - built on GCP"
-    index:
-        product: mobile
-        job-name: android-x86_64-gcp-debug
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: android-5-0-x86_64/debug
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        docker-image: {in-tree: android-build}
-        max-run-time: 7200
-        env:
-            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
-            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-        artifacts:
-            - name: public/android/maven
-              # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
-              type: directory
-            - name: public/build/target.maven.zip
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
-              type: file
-            - name: public/build/geckoview-androidTest.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
-              type: file
-            - name: public/build/geckoview_example.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
-              type: file
-            - name: public/build
-              path: /builds/worker/artifacts/
-              type: directory
-    run:
-        using: mozharness
-        actions: [get-secrets, build]
-        config:
-            - builds/releng_base_android_64_builds.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        custom-build-variant-cfg: x86_64-debug
-        tooltool-downloads: internal
-    toolchains:
-        - android-gradle-dependencies
-        - android-ndk-linux
-        - android-sdk-linux
-        - linux64-clang
-        - linux64-rust-android
-        - linux64-rust-size
-        - linux64-cbindgen
-        - linux64-sccache
-        - linux64-nasm
-        - linux64-node
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -1134,241 +1134,8 @@ linux64-aarch64/opt:
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
         - linux64-node
-
-linux-gcp/debug:
-    description: "Linux32 Debug - built on GCP"
-    index:
-        product: firefox
-        job-name: linux-gcp-debug
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: linux32/debug
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        docker-image: {in-tree: debian7-i386-build}
-        max-run-time: 5400
-        env:
-            PERFHERDER_EXTRA_OPTIONS: gcp
-    run:
-        using: mozharness
-        actions: [get-secrets, build, check-test]
-        config:
-            - builds/releng_base_firefox.py
-            - builds/releng_base_linux_32_builds.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        custom-build-variant-cfg: debug
-        mozconfig-variant: debug
-        tooltool-downloads: public
-        need-xvfb: true
-    toolchains:
-        - linux64-binutils
-        - linux64-clang
-        - linux64-rust
-        - linux64-rust-size
-        - linux64-cbindgen
-        - linux64-sccache
-        - linux64-nasm
-        - linux64-node
-
-linux-gcp/opt:
-    description: "Linux32 Opt - built on GCP"
-    index:
-        product: firefox
-        job-name: linux-gcp-opt
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: linux32/opt
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        docker-image: {in-tree: debian7-i386-build}
-        max-run-time: 7200
-        env:
-            PERFHERDER_EXTRA_OPTIONS: gcp
-    run:
-        using: mozharness
-        actions: [get-secrets, build, check-test]
-        config:
-            - builds/releng_base_firefox.py
-            - builds/releng_base_linux_32_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-nasm
-        - linux64-node
-
-linux-gcp-shippable/opt:
-    description: "Linux32 Shippable - built on GCP"
-    attributes:
-        shippable: true
-        enable-full-crashsymbols: true
-    shipping-phase: build
-    shipping-product: firefox
-    index:
-        product: firefox
-        job-name: linux-gcp-opt
-        type: shippable
-    treeherder:
-        platform: linux32-shippable/opt
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        docker-image: {in-tree: debian7-i386-build}
-        max-run-time: 7200
-        env:
-            PERFHERDER_EXTRA_OPTIONS: gcp
-    run:
-        using: mozharness
-        actions: [get-secrets, build, check-test]
-        config:
-            - builds/releng_base_firefox.py
-            - builds/releng_base_linux_32_builds.py
-            - taskcluster_nightly.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        tooltool-downloads: public
-        need-xvfb: true
-    toolchains:
-        - linux64-binutils
-        - linux64-clang
-        - linux64-rust
-        - linux64-rust-size
-        - linux64-cbindgen
-        - linux64-nasm
-        - linux64-node
-
-linux64-gcp/debug:
-    description: "Linux64 Debug - built on GCP"
-    index:
-        product: firefox
-        job-name: linux64-gcp-debug
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: linux64/debug
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        max-run-time: 5400
-        env:
-            PERFHERDER_EXTRA_OPTIONS: gcp
-    run:
-        using: mozharness
-        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
-        custom-build-variant-cfg: debug
-        mozconfig-variant: debug
-        tooltool-downloads: public
-        need-xvfb: true
-    toolchains:
-        - linux64-binutils
-        - linux64-clang
-        - linux64-cbindgen
-        - linux64-sccache
-        - linux64-rust
-        - linux64-rust-size
-        - linux64-nasm
-        - linux64-node
-
-linux64-gcp/opt:
-    description: "Linux64 Opt - built on GCP"
-    index:
-        product: firefox
-        job-name: linux64-gcp-opt
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: linux64/opt
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        max-run-time: 7200
-        env:
-            PERFHERDER_EXTRA_OPTIONS: gcp
-    run:
-        using: mozharness
-        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-nasm
-        - linux64-node
-
-linux64-gcp-shippable/opt:
-    description: "Linux64 Shippable - built on GCP"
-    attributes:
-        shippable: true
-        enable-full-crashsymbols: true
-    shipping-phase: build
-    shipping-product: firefox
-    index:
-        product: firefox
-        job-name: linux64-gcp-opt
-        type: shippable
-    treeherder:
-        platform: linux64-shippable/opt
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        max-run-time: 7200
-        env:
-            PERFHERDER_EXTRA_OPTIONS: gcp
-    run:
-        using: mozharness
-        actions: [get-secrets, build, check-test]
-        config:
-            - builds/releng_base_firefox.py
-            - builds/releng_base_linux_64_builds.py
-            - taskcluster_nightly.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        tooltool-downloads: public
-        need-xvfb: true
-    toolchains:
-        - linux64-binutils
-        - linux64-clang
-        - linux64-rust
-        - linux64-rust-size
-        - linux64-cbindgen
-        - linux64-nasm
-        - linux64-node
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -368,135 +368,8 @@ macosx64-ccov/debug:
         - linux64-libdmg
         - linux64-llvm-dsymutil
         - linux64-rust-nightly-macos
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
         - linux64-nasm
         - linux64-node
-
-macosx64-gcp/debug:
-    description: "MacOS X x64 Cross-compile - built on GCP"
-    index:
-        product: firefox
-        job-name: macosx64-gcp-debug
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: osx-cross/debug
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        max-run-time: 3600
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-    run:
-        using: mozharness
-        actions: [get-secrets, build]
-        config:
-            - builds/releng_base_firefox.py
-            - builds/releng_base_mac_64_cross_builds.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        custom-build-variant-cfg: cross-debug
-        mozconfig-variant: debug
-        tooltool-downloads: internal
-    toolchains:
-        - linux64-binutils
-        - linux64-cctools-port
-        - linux64-clang
-        - linux64-hfsplus
-        - linux64-libdmg
-        - linux64-llvm-dsymutil
-        - linux64-rust-macos
-        - linux64-rust-size
-        - linux64-cbindgen
-        - linux64-sccache
-        - linux64-nasm
-        - linux64-node
-
-macosx64-gcp/opt:
-    description: "MacOS X x64 Cross-compile - built on GCP"
-    index:
-        product: firefox
-        job-name: macosx64-gcp-opt
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: osx-cross/opt
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        max-run-time: 7200
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-    run:
-        using: mozharness
-        actions: [get-secrets, build]
-        config:
-            - builds/releng_base_firefox.py
-            - builds/releng_base_mac_64_cross_builds.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        tooltool-downloads: internal
-    run-on-projects: ['mozilla-central', 'try']
-    toolchains:
-        - linux64-binutils
-        - linux64-cctools-port
-        - linux64-clang
-        - linux64-hfsplus
-        - linux64-libdmg
-        - linux64-llvm-dsymutil
-        - linux64-rust-macos
-        - linux64-rust-size
-        - linux64-cbindgen
-        - linux64-sccache
-        - linux64-nasm
-        - linux64-node
-
-macosx64-gcp-shippable/opt:
-    description: "MacOS X x64 Cross-compile - built on GCP"
-    attributes:
-        shippable: true
-        enable-full-crashsymbols: true
-    shipping-phase: build
-    shipping-product: firefox
-    index:
-        product: firefox
-        job-name: macosx64-gcp-opt
-        type: shippable
-    treeherder:
-        platform: osx-shippable/opt
-        symbol: Bg
-        tier: 3
-    worker-type: gce/gecko-{level}-b-linux
-    worker:
-        max-run-time: 7200
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-    run:
-        using: mozharness
-        actions: [get-secrets, build]
-        config:
-            - builds/releng_base_firefox.py
-            - builds/releng_base_mac_64_cross_builds.py
-            - taskcluster_nightly.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        tooltool-downloads: internal
-    toolchains:
-        - linux64-binutils
-        - linux64-cctools-port
-        - linux64-clang
-        - linux64-hfsplus
-        - linux64-libdmg
-        - linux64-llvm-dsymutil
-        - linux64-rust-macos
-        - linux64-rust-size
-        - linux64-cbindgen
-        - linux64-nasm
-        - linux64-node
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -1156,242 +1156,8 @@ win64-aarch64-devedition-nightly/opt:
     run-on-projects: ['mozilla-beta']
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-rust-size
         - win64-cbindgen
         - win64-nasm
         - win64-node
-
-
-win32-gcp/debug:
-    description: "Win32 Debug - built on GCP"
-    index:
-        product: firefox
-        job-name: win32-gcp-debug
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: windows2012-32/debug
-        symbol: Bg
-        tier: 3
-    worker-type: releng-hardware/gecko-{level}-b-win2012-gamma
-    worker:
-        max-run-time: 7200
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-    run:
-        options: [append-env-variables-from-configs]
-        script: mozharness/scripts/fx_desktop_build.py
-        secrets: true
-        config:
-            - builds/releng_base_firefox.py
-            - builds/taskcluster_base_windows.py
-            - builds/taskcluster_base_win32.py
-            - builds/taskcluster_sub_win32/debug.py
-        mozconfig-variant: debug
-    toolchains:
-        - win64-clang-cl
-        - win64-rust
-        - win64-rust-size
-        - win64-cbindgen
-        - win64-sccache
-        - win64-nasm
-        - win64-node
-
-win32-gcp/opt:
-    description: "Win32 Opt - built on GCP"
-    index:
-        product: firefox
-        job-name: win32-gcp-opt
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: windows2012-32/opt
-        symbol: Bg
-        tier: 3
-    worker-type: releng-hardware/gecko-{level}-b-win2012-gamma
-    worker:
-        max-run-time: 7200
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-    run:
-        options: [append-env-variables-from-configs]
-        script: mozharness/scripts/fx_desktop_build.py
-        secrets: true
-        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
-
-win32-gcp-shippable/opt:
-    description: "Win32 Opt Shippable - built on GCP"
-    index:
-        product: firefox
-        job-name: win32-gcp-opt
-        type: shippable
-    attributes:
-        shippable: true
-        enable-full-crashsymbols: true
-    stub-installer:
-        by-project:
-            default: false
-            mozilla-central: true
-            try: true
-            mozilla-beta: true
-            mozilla-release: true
-    shipping-phase: build
-    shipping-product: firefox
-    treeherder:
-        platform: windows2012-32-shippable/opt
-        symbol: Bg
-        tier: 3
-    worker-type: releng-hardware/gecko-{level}-b-win2012-gamma
-    worker:
-        max-run-time: 10800
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-    run:
-        options: [append-env-variables-from-configs]
-        script: mozharness/scripts/fx_desktop_build.py
-        secrets: true
-        config:
-            - builds/releng_base_firefox.py
-            - builds/taskcluster_base_windows.py
-            - builds/taskcluster_base_win32.py
-            - taskcluster_nightly.py
-        extra-config:
-            stage_platform: win32
-    toolchains:
-        - win64-clang-cl
-        - win64-rust
-        - win64-rust-size
-        - win64-cbindgen
-        - win64-nasm
-        - win64-node
-
-win64-gcp/debug:
-    description: "Win64 Debug - built on GCP"
-    index:
-        product: firefox
-        job-name: win64-gcp-debug
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: windows2012-64/debug
-        symbol: Bg
-        tier: 3
-    worker-type: releng-hardware/gecko-{level}-b-win2012-gamma
-    worker:
-        max-run-time: 7200
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-    run:
-        options: [append-env-variables-from-configs]
-        script: mozharness/scripts/fx_desktop_build.py
-        secrets: true
-        config:
-            - builds/releng_base_firefox.py
-            - builds/taskcluster_base_windows.py
-            - builds/taskcluster_base_win64.py
-            - builds/taskcluster_sub_win64/debug.py
-        mozconfig-variant: debug
-    toolchains:
-        - win64-clang-cl
-        - win64-rust
-        - win64-rust-size
-        - win64-cbindgen
-        - win64-sccache
-        - win64-nasm
-        - win64-node
-
-win64-gcp/opt:
-    description: "Win64 Opt - built on GCP"
-    index:
-        product: firefox
-        job-name: win64-gcp-opt
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: windows2012-64/opt
-        symbol: Bg
-        tier: 3
-    worker-type: releng-hardware/gecko-{level}-b-win2012-gamma
-    worker:
-        max-run-time: 7200
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-    run:
-        options: [append-env-variables-from-configs]
-        script: mozharness/scripts/fx_desktop_build.py
-        secrets: true
-        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
-
-win64-gcp-shippable/opt:
-    description: "Win64 Shippable - built on GCP"
-    index:
-        product: firefox
-        job-name: win64-gcp-opt
-        type: shippable
-    attributes:
-        shippable: true
-        enable-full-crashsymbols: true
-    shipping-phase: build
-    shipping-product: firefox
-    treeherder:
-        platform: windows2012-64-shippable/opt
-        symbol: Bg
-        tier: 3
-    worker-type: releng-hardware/gecko-{level}-b-win2012-gamma
-    worker:
-        max-run-time: 10800
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
-            PERFHERDER_EXTRA_OPTIONS: gcp
-    run:
-        options: [append-env-variables-from-configs]
-        script: mozharness/scripts/fx_desktop_build.py
-        secrets: true
-        config:
-            - builds/releng_base_firefox.py
-            - builds/taskcluster_base_windows.py
-            - builds/taskcluster_base_win64.py
-            - taskcluster_nightly.py
-        extra-config:
-            stage_platform: win64
-    toolchains:
-        - win64-clang-cl
-        - win64-rust
-        - win64-rust-size
-        - win64-cbindgen
-        - win64-nasm
-        - win64-node
--- a/taskcluster/taskgraph/util/workertypes.py
+++ b/taskcluster/taskgraph/util/workertypes.py
@@ -8,20 +8,16 @@ from mozbuild.util import memoize
 
 from .taskcluster import get_root_url
 from .keyed_by import evaluate_keyed_by
 from .attributes import keymatch
 
 WORKER_TYPES = {
     'gce/gecko-1-b-linux': ('docker-worker', 'linux'),
     'releng-hardware/gecko-1-b-win2012-gamma': ('generic-worker', 'windows'),
-    'gce/gecko-2-b-linux': ('docker-worker', 'linux'),
-    'releng-hardware/gecko-2-b-win2012-gamma': ('generic-worker', 'windows'),
-    'gce/gecko-3-b-linux': ('docker-worker', 'linux'),
-    'releng-hardware/gecko-3-b-win2012-gamma': ('generic-worker', 'windows'),
     'invalid/invalid': ('invalid', None),
     'invalid/always-optimized': ('always-optimized', None),
     'scriptworker-prov-v1/balrog-dev': ('balrog', None),
     'scriptworker-prov-v1/balrogworker-v1': ('balrog', None),
     'scriptworker-prov-v1/beetmoverworker-v1': ('beetmover', None),
     'scriptworker-prov-v1/pushapk-v1': ('push-apk', None),
     "scriptworker-prov-v1/signing-linux-v1": ('scriptworker-signing', None),
     "scriptworker-prov-v1/shipit": ('shipit', None),