Port bug 1469436 (two changesets: 2477607822a3 and 33f3e7a6ca7a). rs=bustage-fix
authorJorg K <jorgk@jorgk.com>
Fri, 13 Jul 2018 13:24:28 +0200
changeset 31971 0db5f3f7acd8b1f9d71794c8ed2da363b3fed6e6
parent 31970 e224e5b9ec04a6a83119e5698f96f0b6c93c9be4
child 31972 5d43ca613923a9e4362628efdeba170518966bca
push id117
push usermozilla@jorgk.com
push dateSat, 08 Dec 2018 23:08:57 +0000
treeherdercomm-esr60@42ff108f0802 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1469436
Port bug 1469436 (two changesets: 2477607822a3 and 33f3e7a6ca7a). rs=bustage-fix * * * Port bug 1469436, take 2 (port more of changeset 33f3e7a6ca7a). rs=bustage-fix * * * Port bug 1469436, take 3 (port more of changeset 33f3e7a6ca7a). rs=bustage-fix
taskcluster/ci/beetmover-repackage/kind.yml
taskcluster/ci/nightly-l10n/kind.yml
taskcluster/ci/repackage-signing-l10n/kind.yml
taskcluster/ci/repackage-signing/kind.yml
--- a/taskcluster/ci/beetmover-repackage/kind.yml
+++ b/taskcluster/ci/beetmover-repackage/kind.yml
@@ -9,16 +9,17 @@ transforms:
     - taskgraph.transforms.beetmover_repackage_l10n:transforms
     - taskgraph.transforms.beetmover_repackage:transforms
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine_and_stub_installer
     - comm_taskgraph:beetmover_add_langpack
 
 kind-dependencies:
     - repackage-signing
+    - repackage-signing-l10n
 
 fake-multi-dep: true
 
 only-for-build-platforms:
     - linux-nightly/opt
     - linux64-nightly/opt
     - macosx64-nightly/opt
     - win32-nightly/opt
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -1,22 +1,27 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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
+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
+    - repackage-signing
     - toolchain
 
 only-for-build-platforms:
     - linux64-nightly/opt
     - linux-nightly/opt
     - macosx64-nightly/opt
     - win32-nightly/opt
     - win64-nightly/opt
@@ -62,33 +67,33 @@ job-template:
                 macosx64-nightly: osx-cross/opt
                 win32-nightly: windows2012-32/opt
                 win64-nightly: windows2012-64/opt
     env:
         by-build-platform:
             linux.*:   # linux64 and 32 get same treatment here
                 EN_US_PACKAGE_NAME: target.tar.bz2
                 EN_US_BINARY_URL:
-                    task-reference: https://queue.taskcluster.net/v1/task/<signed-build>/artifacts/public/build
+                    task-reference: https://queue.taskcluster.net/v1/task/<build-signing>/artifacts/public/build
                 MAR_TOOLS_URL:
-                    task-reference: https://queue.taskcluster.net/v1/task/<unsigned-build>/artifacts/public/build/host/bin
+                    task-reference: https://queue.taskcluster.net/v1/task/<build>/artifacts/public/build/host/bin
             macosx64-nightly:
                 EN_US_PACKAGE_NAME: target.dmg
                 EN_US_BINARY_URL:
                     task-reference: https://queue.taskcluster.net/v1/task/<repackage>/artifacts/public/build
                 MAR_TOOLS_URL:
-                    task-reference: https://queue.taskcluster.net/v1/task/<unsigned-build>/artifacts/public/build/host/bin
+                    task-reference: https://queue.taskcluster.net/v1/task/<build>/artifacts/public/build/host/bin
             win.*:
                 EN_US_PACKAGE_NAME: target.zip
                 EN_US_BINARY_URL:
-                    task-reference: https://queue.taskcluster.net/v1/task/<signed-build>/artifacts/public/build
+                    task-reference: https://queue.taskcluster.net/v1/task/<build-signing>/artifacts/public/build
                 EN_US_INSTALLER_BINARY_URL:
-                    task-reference: https://queue.taskcluster.net/v1/task/<repackage-signed>/artifacts/public/build
+                    task-reference: https://queue.taskcluster.net/v1/task/<repackage-signing>/artifacts/public/build
                 MAR_TOOLS_URL:
-                    task-reference: https://queue.taskcluster.net/v1/task/<unsigned-build>/artifacts/public/build/host/bin
+                    task-reference: https://queue.taskcluster.net/v1/task/<build>/artifacts/public/build/host/bin
     mozharness:
         comm-checkout: true
         config-paths:
             - comm/mozharness
         config:
             # no default, so we fail on new entries
             by-build-platform:
                 linux-nightly:
copy from taskcluster/ci/repackage-signing/kind.yml
copy to taskcluster/ci/repackage-signing-l10n/kind.yml
--- a/taskcluster/ci/repackage-signing/kind.yml
+++ b/taskcluster/ci/repackage-signing-l10n/kind.yml
@@ -7,17 +7,16 @@ loader: taskgraph.loader.single_dep:load
 transforms:
     - taskgraph.transforms.name_sanity:transforms
     - taskgraph.transforms.repackage_signing:transforms
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine_and_stub_installer
 
 
 kind-dependencies:
-    - repackage
     - repackage-l10n
 
 only-for-build-platforms:
     - linux-nightly/opt
     - linux64-nightly/opt
     - macosx64-nightly/opt
     - win32-nightly/opt
     - win64-nightly/opt
--- a/taskcluster/ci/repackage-signing/kind.yml
+++ b/taskcluster/ci/repackage-signing/kind.yml
@@ -8,16 +8,15 @@ transforms:
     - taskgraph.transforms.name_sanity:transforms
     - taskgraph.transforms.repackage_signing:transforms
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine_and_stub_installer
 
 
 kind-dependencies:
     - repackage
-    - repackage-l10n
 
 only-for-build-platforms:
     - linux-nightly/opt
     - linux64-nightly/opt
     - macosx64-nightly/opt
     - win32-nightly/opt
     - win64-nightly/opt