Bug 1574115 - Port bug 1573435 - Use toolchain fetches for more task kinds; rs=bustage-fix DONTBUILD
authorGeoff Lankow <geoff@darktrojan.net>
Thu, 15 Aug 2019 22:13:11 +1200
changeset 27330 ecccd8455117a4377ff4727fa6ebe32c6e4849a9
parent 27329 768ececa54d441f2a7b87676278e910ace8f10b7
child 27331 91539be83495f83daab9b943d0c238c7fa4d8b49
push id16286
push usergeoff@darktrojan.net
push dateThu, 15 Aug 2019 10:13:48 +0000
treeherdercomm-central@ecccd8455117 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1574115, 1573435
Bug 1574115 - Port bug 1573435 - Use toolchain fetches for more task kinds; rs=bustage-fix DONTBUILD
taskcluster/ci/build/kind.yml
taskcluster/ci/build/linux.yml
taskcluster/ci/build/macosx.yml
taskcluster/ci/build/windows.yml
taskcluster/ci/nightly-l10n/kind.yml
taskcluster/ci/release-source/kind.yml
taskcluster/ci/repackage-l10n/kind.yml
taskcluster/ci/repackage-msi/kind.yml
taskcluster/ci/repackage/kind.yml
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@@ -6,17 +6,16 @@ loader: taskgraph.loader.transform:loade
 
 kind-dependencies:
     - toolchain
 
 transforms:
     - taskgraph.transforms.build:transforms
     - taskgraph.transforms.build_attrs:transforms
     - taskgraph.transforms.build_lints:transforms
-    - taskgraph.transforms.use_toolchains:transforms
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
 jobs-from:
     - linux.yml
     - macosx.yml
     - windows.yml
 
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -20,24 +20,25 @@ linux64/opt:
         actions: [build, check-test]
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_linux_64_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         need-xvfb: true
-    toolchains:
-        - linux64-binutils
-        - linux64-cbindgen
-        - linux64-clang
-        - linux64-nasm
-        - linux64-node
-        - linux64-rust
-        - linux64-sccache
+    fetches:
+        toolchain:
+            - linux64-binutils
+            - linux64-cbindgen
+            - linux64-clang
+            - linux64-nasm
+            - linux64-node
+            - linux64-rust
+            - linux64-sccache
 
 linux64-shippable/opt:
     description: "Linux64 Shippable"
     attributes:
         shippable: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
@@ -59,23 +60,24 @@ linux64-shippable/opt:
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_linux_64_builds.py
             - taskcluster_nightly.py
         script: "mozharness/scripts/fx_desktop_build.py"
         need-xvfb: true
-    toolchains:
-        - linux64-binutils
-        - linux64-cbindgen
-        - linux64-clang
-        - linux64-nasm
-        - linux64-node
-        - linux64-rust
+    fetches:
+        toolchain:
+            - linux64-binutils
+            - linux64-cbindgen
+            - linux64-clang
+            - linux64-nasm
+            - linux64-node
+            - linux64-rust
 
 linux64/debug:
     description: "Linux64 Debug"
     index:
         product: thunderbird
         job-name: linux64-debug
     treeherder:
         platform: linux64/debug
@@ -92,24 +94,25 @@ linux64/debug:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_linux_64_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         custom-build-variant-cfg: debug
         mozconfig-variant: debug
         need-xvfb: true
-    toolchains:
-        - linux64-binutils
-        - linux64-cbindgen
-        - linux64-clang
-        - linux64-nasm
-        - linux64-node
-        - linux64-rust
-        - linux64-sccache
+    fetches:
+        toolchain:
+            - linux64-binutils
+            - linux64-cbindgen
+            - linux64-clang
+            - linux64-nasm
+            - linux64-node
+            - linux64-rust
+            - linux64-sccache
 
 linux/opt:
     description: "Linux32 Opt"
     index:
         product: thunderbird
         job-name: linux32-opt
     treeherder:
         platform: linux32/opt
@@ -124,24 +127,25 @@ linux/opt:
         actions: [build, check-test]
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_linux_32_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         need-xvfb: true
-    toolchains:
-        - linux64-binutils
-        - linux64-cbindgen
-        - linux64-clang
-        - linux64-nasm
-        - linux64-node
-        - linux64-rust
-        - linux64-sccache
+    fetches:
+        toolchain:
+            - linux64-binutils
+            - linux64-cbindgen
+            - linux64-clang
+            - linux64-nasm
+            - linux64-node
+            - linux64-rust
+            - linux64-sccache
 
 linux-shippable/opt:
     description: "Linux32 Shippable"
     attributes:
         shippable: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
@@ -163,23 +167,24 @@ linux-shippable/opt:
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_linux_32_builds.py
             - taskcluster_nightly.py
         script: "mozharness/scripts/fx_desktop_build.py"
         need-xvfb: true
-    toolchains:
-        - linux64-binutils
-        - linux64-cbindgen
-        - linux64-clang
-        - linux64-nasm
-        - linux64-node
-        - linux64-rust
+    fetches:
+        toolchain:
+            - linux64-binutils
+            - linux64-cbindgen
+            - linux64-clang
+            - linux64-nasm
+            - linux64-node
+            - linux64-rust
 
 linux/debug:
     description: "Linux32 Debug"
     index:
         product: thunderbird
         job-name: linux32-debug
     treeherder:
         platform: linux32/debug
@@ -196,16 +201,17 @@ linux/debug:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_linux_32_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         custom-build-variant-cfg: debug
         mozconfig-variant: debug
         need-xvfb: true
-    toolchains:
-        - linux64-binutils
-        - linux64-cbindgen
-        - linux64-clang
-        - linux64-nasm
-        - linux64-node
-        - linux64-rust
-        - linux64-sccache
+    fetches:
+        toolchain:
+            - linux64-binutils
+            - linux64-cbindgen
+            - linux64-clang
+            - linux64-nasm
+            - linux64-node
+            - linux64-rust
+            - linux64-sccache
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -25,28 +25,29 @@ macosx64/debug:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_mac_64_cross_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         custom-build-variant-cfg: cross-debug
         mozconfig-variant: debug
         tooltool-downloads: internal
-    toolchains:
-        - linux64-binutils
-        - linux64-cbindgen
-        - linux64-cctools-port
-        - linux64-clang-macosx-cross
-        - linux64-hfsplus
-        - linux64-libdmg
-        - linux64-llvm-dsymutil
-        - linux64-nasm
-        - linux64-node
-        - linux64-rust-macos
-        - linux64-sccache
+    fetches:
+        toolchain:
+            - linux64-binutils
+            - linux64-cbindgen
+            - linux64-cctools-port
+            - linux64-clang-macosx-cross
+            - linux64-hfsplus
+            - linux64-libdmg
+            - linux64-llvm-dsymutil
+            - linux64-nasm
+            - linux64-node
+            - linux64-rust-macos
+            - linux64-sccache
 
 macosx64/opt:
     description: "MacOS X x64 Cross-compile"
     index:
         product: thunderbird
         job-name: macosx64-opt
     treeherder:
         platform: osx-cross/opt
@@ -64,28 +65,29 @@ macosx64/opt:
         actions: [build]
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_mac_64_cross_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         tooltool-downloads: internal
-    toolchains:
-        - linux64-binutils
-        - linux64-cbindgen
-        - linux64-cctools-port
-        - linux64-clang-macosx-cross
-        - linux64-hfsplus
-        - linux64-libdmg
-        - linux64-llvm-dsymutil
-        - linux64-nasm
-        - linux64-node
-        - linux64-rust-macos
-        - linux64-sccache
+    fetches:
+        toolchain:
+            - linux64-binutils
+            - linux64-cbindgen
+            - linux64-cctools-port
+            - linux64-clang-macosx-cross
+            - linux64-hfsplus
+            - linux64-libdmg
+            - linux64-llvm-dsymutil
+            - linux64-nasm
+            - linux64-node
+            - linux64-rust-macos
+            - linux64-sccache
 
 macosx64-shippable/opt:
     description: "MacOS X x64 Cross-compile"
     attributes:
         shippable: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
@@ -110,19 +112,20 @@ macosx64-shippable/opt:
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_mac_64_cross_builds.py
             - taskcluster_nightly.py
         script: "mozharness/scripts/fx_desktop_build.py"
         tooltool-downloads: internal
-    toolchains:
-        - linux64-binutils
-        - linux64-cbindgen
-        - linux64-cctools-port
-        - linux64-clang-macosx-cross
-        - linux64-hfsplus
-        - linux64-libdmg
-        - linux64-llvm-dsymutil
-        - linux64-nasm
-        - linux64-node
-        - linux64-rust-macos
+    fetches:
+        toolchain:
+            - linux64-binutils
+            - linux64-cbindgen
+            - linux64-cctools-port
+            - linux64-clang-macosx-cross
+            - linux64-hfsplus
+            - linux64-libdmg
+            - linux64-llvm-dsymutil
+            - linux64-nasm
+            - linux64-node
+            - linux64-rust-macos
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -29,23 +29,24 @@ win32/opt:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
         extra-config:
             stage_platform: win32
-    toolchains:
-        - win64-cbindgen
-        - win64-clang-cl
-        - win64-nasm
-        - win64-node
-        - win64-rust
-        - win64-sccache
+    fetches:
+        toolchain:
+            - win64-cbindgen
+            - win64-clang-cl
+            - win64-nasm
+            - win64-node
+            - win64-rust
+            - win64-sccache
 
 win32-shippable/opt:
     description: "Win32 Opt Shippable"
     index:
         product: thunderbird
         job-name: win32-opt
         type: shippable
     attributes:
@@ -68,22 +69,23 @@ win32-shippable/opt:
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
             - taskcluster_nightly.py
         extra-config:
             stage_platform: win32
-    toolchains:
-        - win64-cbindgen
-        - win64-clang-cl
-        - win64-nasm
-        - win64-node
-        - win64-rust
+    fetches:
+        toolchain:
+            - win64-cbindgen
+            - win64-clang-cl
+            - win64-nasm
+            - win64-node
+            - win64-rust
 
 win32/debug:
     description: "Win32 Debug"
     index:
         product: thunderbird
         job-name: win32-debug
     treeherder:
         platform: windows2012-32/debug
@@ -99,23 +101,24 @@ win32/debug:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
             - builds/taskcluster_sub_win32/debug.py
         mozconfig-variant: debug
-    toolchains:
-        - win64-cbindgen
-        - win64-clang-cl
-        - win64-nasm
-        - win64-node
-        - win64-rust
-        - win64-sccache
+    fetches:
+        toolchain:
+            - win64-cbindgen
+            - win64-clang-cl
+            - win64-nasm
+            - win64-node
+            - win64-rust
+            - win64-sccache
 
 win64/opt:
     description: "Win64 Opt"
     index:
         product: thunderbird
         job-name: win64-opt
     treeherder:
         platform: windows2012-64/opt
@@ -131,23 +134,24 @@ win64/opt:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
         extra-config:
             stage_platform: win64
-    toolchains:
-        - win64-cbindgen
-        - win64-clang-cl
-        - win64-nasm
-        - win64-node
-        - win64-rust
-        - win64-sccache
+    fetches:
+        toolchain:
+            - win64-cbindgen
+            - win64-clang-cl
+            - win64-nasm
+            - win64-node
+            - win64-rust
+            - win64-sccache
 
 win64-shippable/opt:
     description: "Win64 Opt Shippable"
     index:
         product: thunderbird
         job-name: win64-opt
         type: shippable
     attributes:
@@ -170,22 +174,23 @@ win64-shippable/opt:
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
             - taskcluster_nightly.py
         extra-config:
             stage_platform: win64
-    toolchains:
-        - win64-cbindgen
-        - win64-clang-cl
-        - win64-nasm
-        - win64-node
-        - win64-rust
+    fetches:
+        toolchain:
+            - win64-cbindgen
+            - win64-clang-cl
+            - win64-nasm
+            - win64-node
+            - win64-rust
 
 win64/debug:
     description: "Win64 Debug"
     index:
         product: thunderbird
         job-name: win64-debug
     treeherder:
         platform: windows2012-64/debug
@@ -201,15 +206,16 @@ win64/debug:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
             - builds/taskcluster_sub_win64/debug.py
         mozconfig-variant: debug
-    toolchains:
-        - win64-cbindgen
-        - win64-clang-cl
-        - win64-nasm
-        - win64-node
-        - win64-rust
-        - win64-sccache
+    fetches:
+        toolchain:
+            - win64-cbindgen
+            - win64-clang-cl
+            - win64-nasm
+            - win64-node
+            - win64-rust
+            - win64-sccache
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -3,17 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ---
 loader: taskgraph.loader.multi_dep:loader
 
 group-by: platform
 
 transforms:
     - taskgraph.transforms.l10n:transforms
-    - taskgraph.transforms.use_toolchains:transforms
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - build
     - build-signing
     - repackage
     - toolchain
@@ -37,22 +36,23 @@ job-template:
     ignore-locales:
         by-build-platform:
             # OSX has a special locale for japanese
             macosx64.*: [ja]
             default: [ja-JP-mac]
     run-time: 36000
     secrets: false
     docker-image: null
-    toolchains:
-        by-build-platform:
-            default: []
-            macosx64.*:
-                - linux64-libdmg
-                - linux64-hfsplus
+    fetches:
+        toolchain:
+            by-build-platform:
+                default: []
+                macosx64.*:
+                    - linux64-libdmg
+                    - linux64-hfsplus
     tooltool:
         by-build-platform:
             default: internal
             linux.*: public
     index:
         type: shippable-l10n
         product: thunderbird
         job-name:
--- a/taskcluster/ci/release-source/kind.yml
+++ b/taskcluster/ci/release-source/kind.yml
@@ -6,17 +6,16 @@ loader: taskgraph.loader.transform:loade
 
 kind-dependencies:
     - toolchain
 
 transforms:
     - taskgraph.transforms.build:transforms
     - taskgraph.transforms.build_attrs:transforms
     - taskgraph.transforms.build_lints:transforms
-    - taskgraph.transforms.use_toolchains:transforms
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
 job-defaults:
     shipping-phase: promote
     treeherder:
         symbol: Src
     worker-type: b-linux
--- a/taskcluster/ci/repackage-l10n/kind.yml
+++ b/taskcluster/ci/repackage-l10n/kind.yml
@@ -3,17 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ---
 loader: taskgraph.loader.single_dep:loader
 
 transforms:
     - taskgraph.transforms.repackage_l10n:transforms
     - taskgraph.transforms.name_sanity:transforms
     - taskgraph.transforms.repackage:transforms
-    - taskgraph.transforms.use_toolchains:transforms
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine
 
 kind-dependencies:
     - nightly-l10n-signing
     - toolchain
 
--- a/taskcluster/ci/repackage-msi/kind.yml
+++ b/taskcluster/ci/repackage-msi/kind.yml
@@ -2,17 +2,16 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ---
 loader: taskgraph.loader.single_dep:loader
 
 transforms:
     - taskgraph.transforms.name_sanity:transforms
     - taskgraph.transforms.repackage:transforms
-    - taskgraph.transforms.use_toolchains:transforms
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - repackage-signing
     - repackage-signing-l10n
     - fetch
 
--- a/taskcluster/ci/repackage/kind.yml
+++ b/taskcluster/ci/repackage/kind.yml
@@ -2,17 +2,16 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ---
 loader: taskgraph.loader.single_dep:loader
 
 transforms:
     - taskgraph.transforms.name_sanity:transforms
     - taskgraph.transforms.repackage:transforms
-    - taskgraph.transforms.use_toolchains:transforms
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine
 
 kind-dependencies:
     - build-signing
     - toolchain