Backed out changeset fa0e2d59775c (bug 1418081) for valgrind-test failure. r=backout a=backout on a CLOSED TREE

taskcluster/ci/toolchain/linux.yml

@@ -321,7 +321,7 @@ linux64-android-gradle-dependencies:
         - linux64-android-sdk-linux-repack
         - linux64-proguard-jar-repack
 
-linux64-rust-1.23:
+linux64-rust-1.22:
     description: "rust repack"
     treeherder:
         kind: build
@@ -329,31 +329,6 @@ linux64-rust-1.23:
         symbol: TL(rust)
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
-    worker:
-        docker-image: {in-tree: desktop-build}
-        max-run-time: 7200
-        env:
-            UPLOAD_DIR: artifacts
-    run:
-        using: toolchain-script
-        script: repack_rust.py
-        arguments: [
-            '--channel', '1.23.0',
-            '--host', 'x86_64-unknown-linux-gnu',
-            '--target', 'x86_64-unknown-linux-gnu',
-            '--target', 'i686-unknown-linux-gnu',
-        ]
-        toolchain-alias: linux64-rust
-        toolchain-artifact: public/build/rustc.tar.xz
-
-linux64-rust-1.22:
-    description: "rust repack"
-    treeherder:
-        kind: build
-        platform: toolchains/opt
-        symbol: TL(rust-1.22)
-        tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         docker-image: {in-tree: desktop-build}
         max-run-time: 7200
@@ -368,6 +343,7 @@ linux64-rust-1.22:
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
         ]
+        toolchain-alias: linux64-rust
         toolchain-artifact: public/build/rustc.tar.xz
 
 linux64-rust-1.19:
@@ -394,7 +370,7 @@ linux64-rust-1.19:
         ]
         toolchain-artifact: public/build/rustc.tar.xz
 
-linux64-rust-macos-1.23:
+linux64-rust-macos-1.22:
     description: "rust repack with macos-cross support"
     treeherder:
         kind: build
@@ -411,7 +387,7 @@ linux64-rust-macos-1.23:
         using: toolchain-script
         script: repack_rust.py
         arguments: [
-            '--channel', '1.23.0',
+            '--channel', '1.22.1',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
@@ -419,7 +395,7 @@ linux64-rust-macos-1.23:
         toolchain-alias: linux64-rust-macos
         toolchain-artifact: public/build/rustc.tar.xz
 
-linux64-rust-android-1.23:
+linux64-rust-android-1.22:
     description: "rust repack with android-cross support"
     treeherder:
         kind: build
@@ -436,7 +412,7 @@ linux64-rust-android-1.23:
         using: toolchain-script
         script: repack_rust.py
         arguments: [
-            '--channel', '1.23.0',
+            '--channel', '1.22.1',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'armv7-linux-androideabi',

taskcluster/ci/toolchain/windows.yml

@@ -94,7 +94,7 @@ win64-clang-tidy:
             - 'taskcluster/scripts/misc/build-clang-windows-helper64.sh'
         toolchain-artifact: public/build/clang-tidy.tar.bz2
 
-win64-rust-1.23:
+win64-rust-1.22:
     description: "rust repack"
     treeherder:
         kind: build
@@ -111,7 +111,7 @@ win64-rust-1.23:
         using: toolchain-script
         script: repack_rust.py
         arguments: [
-            '--channel', '1.23.0',
+            '--channel', '1.22.1',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
@@ -142,7 +142,7 @@ win64-rust-1.19:
         ]
         toolchain-artifact: public/build/rustc.tar.bz2
 
-win32-rust-1.23:
+win32-rust-1.23.0-beta.2:
     description: "rust repack"
     treeherder:
         kind: build
@@ -159,14 +159,14 @@ win32-rust-1.23:
         using: toolchain-script
         script: repack_rust.py
         arguments: [
-            '--channel', '1.23.0',
+            '--channel', 'beta-2017-12-08',
             '--host', 'i686-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
         ]
         toolchain-alias: win32-rust
         toolchain-artifact: public/build/rustc.tar.bz2
 
-mingw32-rust-1.23:
+mingw32-rust-1.22:
     description: "rust repack"
     treeherder:
         kind: build
@@ -183,7 +183,7 @@ mingw32-rust-1.23:
         using: toolchain-script
         script: repack_rust.py
         arguments: [
-            '--channel', '1.23.0',
+            '--channel', '1.22.1',
             '--host', 'i686-unknown-linux-gnu',
             '--target', 'i686-pc-windows-gnu',
             '--target', 'x86_64-unknown-linux-gnu',