diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml index b20e1643282a..c74adf9ef935 100644 --- a/taskcluster/ci/build/linux.yml +++ b/taskcluster/ci/build/linux.yml @@ -1218,47 +1218,6 @@ linux-gcp/opt: - 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: @@ -1333,43 +1292,3 @@ linux64-gcp/opt: - 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 diff --git a/taskcluster/ci/build/macosx.yml b/taskcluster/ci/build/macosx.yml index e94a42f89561..89593476ba06 100644 --- a/taskcluster/ci/build/macosx.yml +++ b/taskcluster/ci/build/macosx.yml @@ -456,47 +456,3 @@ macosx64-gcp/opt: - 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