Bug 1720483 - Port bug 1719229: Rename Linux sysroot toolchains. r=justdave

Port of D119846.

Depends on D119887

Differential Revision: https://phabricator.services.mozilla.com/D119888

--HG--
extra : histedit_source : ee6819b39959ad7bd42d2ddd5fa3f1818aef8e88

taskcluster/ci/build/linux.yml

@@ -41,7 +41,7 @@ linux64/opt:
             - linux64-rust
             - linux64-rust-size
             - linux64-sccache
-            - linux64-sysroot
+            - sysroot-x86_64-linux-gnu
 
 linux64-shippable/opt:
     description: "Linux64 Shippable"
@@ -88,7 +88,7 @@ linux64-shippable/opt:
             - linux64-node
             - linux64-rust
             - linux64-rust-size
-            - linux64-sysroot
+            - sysroot-x86_64-linux-gnu
 
 linux64/debug:
     description: "Linux64 Debug"
@@ -131,7 +131,7 @@ linux64/debug:
             - linux64-rust
             - linux64-rust-size
             - linux64-sccache
-            - linux64-sysroot
+            - sysroot-x86_64-linux-gnu
 
 linux64-asan/opt:
     description: "Linux64 Opt ASAN"
@@ -179,7 +179,7 @@ linux64-asan/opt:
             - linux64-rust
             - linux64-rust-size
             - linux64-sccache
-            - linux64-sysroot
+            - sysroot-x86_64-linux-gnu
 
 linux64-tsan/opt:
     description: "Linux64 Opt TSAN"
@@ -227,7 +227,7 @@ linux64-tsan/opt:
             - linux64-rust-dev
             - linux64-rust-size
             - linux64-sccache
-            - linux64-sysroot
+            - sysroot-x86_64-linux-gnu
 
 linux64-aarch64/opt:
     description: "Linux64 aarch64 Opt"
@@ -265,7 +265,7 @@ linux64-aarch64/opt:
     fetches:
         toolchain:
             - linux-aarch64-libotr
-            - linux64-aarch64-sysroot
+            - sysroot-aarch64-linux-gnu
             - linux64-binutils
             - linux64-cbindgen
             - linux64-clang-aarch64-cross
@@ -313,7 +313,7 @@ linux/opt:
             - linux64-rust
             - linux64-rust-size
             - linux64-sccache
-            - linux32-sysroot
+            - sysroot-i686-linux-gnu
 
 linux-shippable/opt:
     description: "Linux32 Shippable"
@@ -361,7 +361,7 @@ linux-shippable/opt:
             - linux64-node
             - linux64-rust
             - linux64-rust-size
-            - linux32-sysroot
+            - sysroot-i686-linux-gnu
 
 linux/debug:
     description: "Linux32 Debug"
@@ -403,4 +403,4 @@ linux/debug:
             - linux64-rust
             - linux64-rust-size
             - linux64-sccache
-            - linux32-sysroot
+            - sysroot-i686-linux-gnu

taskcluster/ci/searchfox/kind.yml

@@ -61,7 +61,7 @@ jobs:
                 - linux64-nasm
                 - linux64-node
                 - linux64-rust
-                - linux64-sysroot
+                - sysroot-x86_64-linux-gnu
 
     macosx64-searchfox/debug:
         description: "MacOS X x64 Debug Cross-compile Searchfox"

taskcluster/ci/toolchain/kind.yml

@@ -10,9 +10,7 @@ kind-dependencies:
     - packages
 
 reference-jobs:
-    - linux32-sysroot
     - linux64-aarch64-compiler-rt-12
-    - linux64-aarch64-sysroot
     - linux64-binutils
     - linux64-cbindgen
     - linux64-cctools-port-clang-11
@@ -55,7 +53,6 @@ reference-jobs:
     - linux64-rust-size
     - linux64-rust-windows-1.47
     - linux64-sccache
-    - linux64-sysroot
     - linux64-toolchain-sysroot
     - linux64-upx
     - linux64-winchecksec
@@ -67,6 +64,9 @@ reference-jobs:
     - macosx64-minidump-stackwalk
     - macosx64-node
     - mingw32-rust-1.51
+    - sysroot-aarch64-linux-gnu
+    - sysroot-i686-linux-gnu
+    - sysroot-x86_64-linux-gnu
     - wasi-sysroot
     - wasi-sysroot-11
     - wasi-sysroot-12

taskcluster/ci/toolchain/libcxx.yml

@@ -28,4 +28,4 @@ linux64-clang-lib32cxx:
             - linux64-binutils
             - linux64-clang-12
             - linux64-gcc-7  # Use what linux64-clang uses
-            - linux32-sysroot
+            - sysroot-i686-linux-gnu

taskcluster/ci/toolchain/libotr.yml

@@ -27,7 +27,7 @@ linux32-libotr:
         toolchain:
             - linux64-clang
             - linux64-binutils
-            - linux32-sysroot
+            - sysroot-i686-linux-gnu
 
 linux64-libotr:
     treeherder:
@@ -38,7 +38,7 @@ linux64-libotr:
         toolchain:
             - linux64-clang
             - linux64-binutils
-            - linux64-sysroot
+            - sysroot-x86_64-linux-gnu
 
 linux-aarch64-libotr:
     treeherder:
@@ -48,7 +48,7 @@ linux-aarch64-libotr:
         arguments: ['linux-aarch64']
     fetches:
         toolchain:
-            - linux64-aarch64-sysroot
+            - sysroot-aarch64-linux-gnu
             - linux64-clang-aarch64-cross
             - linux64-binutils
 

taskcluster/comm_taskgraph/transforms/job/toolchain.py

@@ -127,6 +127,7 @@ def docker_worker_toolchain(config, job, taskdesc):
             "MOZ_BUILD_DATE": config.params["moz_build_date"],
             "MOZ_SCM_LEVEL": config.params["level"],
             "GECKO_PATH": gecko_path,
+            "TOOLCHAIN_ARTIFACT": run["toolchain-artifact"],
         }
     )