Port bug 1458385 - Repackage windows builds on linux. rs=bustage-fix
☠☠ backed out by 89e6f1df09f4 ☠ ☠
authorJorg K <jorgk@jorgk.com>
Wed, 10 Apr 2019 00:24:16 +0200
changeset 72650 d152954d3d35da4e73f33464a6b584c29db682de
parent 72649 760dc9a0cff6a49e7998b3ccecf4debcdf46a7b7
child 72651 d4d8a011185ba2c2132be55078b4a18c4b349555
push id8152
push usergeoff@darktrojan.net
push dateWed, 10 Apr 2019 23:22:46 +0000
treeherdertry-comm-central@19eb3bdd4b1a [default view] [failures only]
reviewersbustage-fix
bugs1458385
Port bug 1458385 - Repackage windows builds on linux. rs=bustage-fix
taskcluster/ci/repackage-l10n/kind.yml
taskcluster/ci/repackage-msi/kind.yml
taskcluster/ci/repackage/kind.yml
taskcluster/ci/toolchain/kind.yml
--- a/taskcluster/ci/repackage-l10n/kind.yml
+++ b/taskcluster/ci/repackage-l10n/kind.yml
@@ -20,16 +20,19 @@ kind-dependencies:
 only-for-build-platforms:
     - linux-nightly/opt
     - linux64-nightly/opt
     - macosx64-nightly/opt
     - win32-nightly/opt
     - win64-nightly/opt
 
 job-template:
+    worker-type: 'aws-provisioner-v1/gecko-{level}-b-linux'
+    worker:
+        docker-image: {"in-tree": "debian7-amd64-build"}
     mozharness:
         comm-checkout: true
         config-paths:
             - comm/mozharness
         config:
             by-build-platform:
                 linux-.*:
                     - repackage/base.py
@@ -57,8 +60,12 @@ job-template:
                     win64.*: [mar, mar-bz2, installer]
             default:
                 by-build-platform:
                     linux-.*: [mar]
                     linux64.*: [mar]
                     macosx64.*: [mar, dmg]
                     win32.*: [mar, installer]
                     win64.*: [mar, installer]
+    fetches:
+        toolchain:
+            - linux64-mar-tools
+            - linux64-upx
--- a/taskcluster/ci/repackage-msi/kind.yml
+++ b/taskcluster/ci/repackage-msi/kind.yml
@@ -16,17 +16,20 @@ kind-dependencies:
     - repackage-signing-l10n
     - fetch
 
 only-for-build-platforms:
     - win32-nightly/opt
     - win64-nightly/opt
 
 job-template:
+    worker-type: 'aws-provisioner-v1/gecko-{level}-b-win2012'
     mozharness:
+        use-magic-mh-args: false
+        use-caches: false
         config:
             by-build-platform:
                 win32\b.*:
                     - repackage/base.py
                     - repackage/win32_signed.py
                 win64\b.*:
                     - repackage/base.py
                     - repackage/win64_signed.py
--- a/taskcluster/ci/repackage/kind.yml
+++ b/taskcluster/ci/repackage/kind.yml
@@ -19,16 +19,19 @@ kind-dependencies:
 only-for-build-platforms:
     - linux-nightly/opt
     - linux64-nightly/opt
     - macosx64-nightly/opt
     - win32-nightly/opt
     - win64-nightly/opt
 
 job-template:
+    worker-type: 'aws-provisioner-v1/gecko-{level}-b-linux'
+    worker:
+        docker-image: {"in-tree": "debian7-amd64-build"}
     mozharness:
         comm-checkout: true
         config-paths:
             - comm/mozharness
         config:
             by-build-platform:
                 linux-.*:
                     - repackage/base.py
@@ -56,8 +59,12 @@ job-template:
                     win64.*: [mar, mar-bz2, installer]
             default:
                 by-build-platform:
                     linux-.*: [mar]
                     linux64.*: [mar]
                     macosx64.*: [mar, dmg]
                     win32.*: [mar, installer]
                     win64.*: [mar, installer]
+    fetches:
+        toolchain:
+            - linux64-mar-tools
+            - linux64-upx
--- a/taskcluster/ci/toolchain/kind.yml
+++ b/taskcluster/ci/toolchain/kind.yml
@@ -8,29 +8,30 @@ base-path: taskcluster/ci
 kind-dependencies:
     - fetch
 
 jobs:
     - linux64-binutils
     - linux64-cbindgen
     - linux64-cctools-port
     - linux64-clang
-    - linux64-clang-3.9
+    - linux64-clang-7
     - linux64-clang-mingw-x64
     - linux64-gcc
-    - linux64-gcc-4.9
     - linux64-hfsplus
     - linux64-libdmg
     - linux64-llvm-dsymutil
+    - linux64-mar-tools
     - linux64-nasm
     - linux64-node
     - linux64-rust
     - linux64-rust-1.28
     - linux64-rust-1.32
     - linux64-rust-macos
     - linux64-sccache
+    - linux64-upx
     - win64-cbindgen
     - win64-clang-cl
     - win64-nasm
     - win64-node
     - win64-rust
     - win64-rust-1.28
     - win64-sccache