Bug 1551739: [taskgraph] Move update-verify tasks to shippable platform; r=Callek
authorTom Prince <mozilla@hocat.ca>
Wed, 15 May 2019 18:01:06 +0000
changeset 532803 4275e29bc6a60262209a287acb7f9d6d3b6bc4a0
parent 532802 a17faa0e5bf8f1680c750e81a5424715a7825387
child 532804 3300402f42393d2682e2143b886776df57c95abf
push id11272
push userapavel@mozilla.com
push dateThu, 16 May 2019 15:28:22 +0000
treeherdermozilla-beta@2265bfc5920d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs1551739
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1551739: [taskgraph] Move update-verify tasks to shippable platform; r=Callek Differential Revision: https://phabricator.services.mozilla.com/D31162
taskcluster/ci/release-secondary-update-verify-config/kind.yml
taskcluster/ci/release-secondary-update-verify/kind.yml
taskcluster/ci/release-update-verify-config/kind.yml
taskcluster/ci/release-update-verify/kind.yml
taskcluster/taskgraph/transforms/update_verify.py
--- a/taskcluster/ci/release-secondary-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-secondary-update-verify-config/kind.yml
@@ -52,29 +52,29 @@ job-defaults:
                 default: "56.0b3"
         mar-channel-id-override: beta
         channel: "beta-localtest"
 
 jobs:
     firefox-secondary-linux:
         treeherder:
             symbol: UVCS
-            platform: linux/opt
+            platform: linux-shippable/opt
             kind: test
             tier: 1
         attributes:
             build_platform: linux-shippable
         extra:
             platform: linux-i686
             updater-platform: linux-x86_64
 
     firefox-secondary-linux64:
         treeherder:
             symbol: UVCS
-            platform: linux64/opt
+            platform: linux64-shippable/opt
             kind: test
             tier: 1
         attributes:
             build_platform: linux64-shippable
         extra:
             platform: linux-x86_64
             updater-platform: linux-x86_64
 
@@ -88,40 +88,40 @@ jobs:
             build_platform: macosx64-shippable
         extra:
             platform: mac
             updater-platform: linux-x86_64
 
     firefox-secondary-win32:
         treeherder:
             symbol: UVCS
-            platform: win32/opt
+            platform: windows2012-32-shippable/opt
             kind: test
             tier: 1
         attributes:
             build_platform: win32-shippable
         extra:
             platform: win32
             updater-platform: linux-x86_64
 
     firefox-secondary-win64:
         treeherder:
             symbol: UVCS
-            platform: win64/opt
+            platform: windows2012-64-shippable/opt
             kind: test
             tier: 1
         attributes:
             build_platform: win64-shippable
         extra:
             platform: win64
             updater-platform: linux-x86_64
 
     firefox-secondary-win64-aarch64:
         treeherder:
             symbol: UVCS
-            platform: win64-aarch64/opt
+            platform: windows2012-aarch64-shippable/opt
             kind: test
             tier: 1
         attributes:
             build_platform: win64-aarch64-shippable
         extra:
             platform: win64-aarch64
             updater-platform: linux-x86_64
--- a/taskcluster/ci/release-secondary-update-verify/kind.yml
+++ b/taskcluster/ci/release-secondary-update-verify/kind.yml
@@ -28,77 +28,50 @@ job-defaults:
               type: file
         docker-image:
             in-tree: "update-verify"
         max-run-time: 7200
         retry-exit-status:
             - 255
         env:
             CHANNEL: "beta-localtest"
+    treeherder:
+        symbol: UV(UVS)
+        kind: test
     extra:
         chunks: 12
 
 jobs:
     firefox-secondary-linux64:
         description: linux64 secondary channel update verify
         shipping-product: firefox
-        treeherder:
-            symbol: UV(UVS)
-            platform: linux64/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: linux64-shippable
 
     firefox-secondary-linux:
         description: linux secondary channel update verify
         shipping-product: firefox
-        treeherder:
-            symbol: UV(UVS)
-            platform: linux32/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: linux-shippable
 
     firefox-secondary-win64:
         description: win64 secondary channel update verify
         shipping-product: firefox
-        treeherder:
-            symbol: UV(UVS)
-            platform: windows2012-64/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: win64-shippable
 
     firefox-secondary-win64-aarch64:
         description: win64 secondary channel update verify
         shipping-product: firefox
-        treeherder:
-            symbol: UV(UVS)
-            platform: windows2012-aarch6464/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: win64-aarch64-shippable
 
     firefox-secondary-win32:
         description: win32 secondary channel update verify
         shipping-product: firefox
-        treeherder:
-            symbol: UV(UVS)
-            platform: windows2012-32/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: win32-shippable
 
     firefox-secondary-macosx64:
         description: macosx64 secondary channel update verify
         shipping-product: firefox
-        treeherder:
-            symbol: UV(UVS)
-            platform: osx-cross/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: macosx64-shippable
--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -72,17 +72,17 @@ job-defaults:
                 esr60: "52.0esr"
                 default: "default"
 
 jobs:
     firefox-linux:
         shipping-product: firefox
         treeherder:
             symbol: UVC
-            platform: linux32/opt
+            platform: linux32-shippable/opt
             kind: test
             tier: 1
         attributes:
             build_platform: linux-shippable
         extra:
             product: firefox
             platform: linux-i686
             updater-platform: linux-x86_64
@@ -96,17 +96,17 @@ jobs:
                 by-release-type:
                     beta: beta
                     default: null
 
     firefox-linux64:
         shipping-product: firefox
         treeherder:
             symbol: UVC
-            platform: linux64/opt
+            platform: linux64-shippable/opt
             kind: test
             tier: 1
         attributes:
             build_platform: linux64-shippable
         extra:
             product: firefox
             platform: linux-x86_64
             updater-platform: linux-x86_64
@@ -120,17 +120,17 @@ jobs:
                 by-release-type:
                     beta: beta
                     default: null
 
     firefox-macosx64:
         shipping-product: firefox
         treeherder:
             symbol: UVC
-            platform: osx-cross/opt
+            platform: osx-shippable/opt
             kind: test
             tier: 1
         attributes:
             build_platform: macosx64-shippable
         extra:
             product: firefox
             platform: mac
             updater-platform: linux-x86_64
@@ -144,17 +144,17 @@ jobs:
                 by-release-type:
                     beta: beta
                     default: null
 
     firefox-win32:
         shipping-product: firefox
         treeherder:
             symbol: UVC
-            platform: windows2012-32/opt
+            platform: windows2012-32-shippable/opt
             kind: test
             tier: 1
         attributes:
             build_platform: win32-shippable
         extra:
             product: firefox
             platform: win32
             updater-platform: linux-x86_64
@@ -168,17 +168,17 @@ jobs:
                 by-release-type:
                     beta: beta
                     default: null
 
     firefox-win64:
         shipping-product: firefox
         treeherder:
             symbol: UVC
-            platform: windows2012-64/opt
+            platform: windows2012-64-shippable/opt
             kind: test
             tier: 1
         attributes:
             build_platform: win64-shippable
         extra:
             product: firefox
             platform: win64
             updater-platform: linux-x86_64
@@ -192,17 +192,17 @@ jobs:
                 by-release-type:
                     beta: beta
                     default: null
 
     firefox-win64-aarch64:
         shipping-product: firefox
         treeherder:
             symbol: UVC
-            platform: windows2012-aarch64/opt
+            platform: windows2012-aarch64-shippable/opt
             kind: test
             tier: 1
         attributes:
             build_platform: win64-aarch64-shippable
         extra:
             product: firefox
             platform: win64-aarch64
             updater-platform: linux-x86_64
--- a/taskcluster/ci/release-update-verify/kind.yml
+++ b/taskcluster/ci/release-update-verify/kind.yml
@@ -26,143 +26,86 @@ job-defaults:
             - name: 'public/build/diff-summary.log'
               path: '/builds/worker/tools/release/updates/diff-summary.log'
               type: file
         docker-image:
             in-tree: "update-verify"
         max-run-time: 5400
         retry-exit-status:
             - 255
+    treeherder:
+        symbol: UV(UV)
+        kind: test
     extra:
         chunks: 16
 
 jobs:
     firefox-linux64:
         description: linux64 update verify
         shipping-product: firefox
-        treeherder:
-            symbol: UV(UV)
-            platform: linux64/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: linux64-shippable
 
     firefox-linux:
         description: linux update verify
         shipping-product: firefox
-        treeherder:
-            symbol: UV(UV)
-            platform: linux32/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: linux-shippable
 
     firefox-win64:
         description: win64 update verify
         shipping-product: firefox
-        treeherder:
-            symbol: UV(UV)
-            platform: windows2012-64/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: win64-shippable
 
     firefox-win64-aarch64:
         description: win64-aarch64 update verify
         shipping-product: firefox
-        treeherder:
-            symbol: UV(UV)
-            platform: windows2012-aarch64/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: win64-aarch64-shippable
 
     firefox-win32:
         description: win32 update verify
         shipping-product: firefox
-        treeherder:
-            symbol: UV(UV)
-            platform: windows2012-32/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: win32-shippable
 
     firefox-macosx64:
         description: macosx64 update verify
         shipping-product: firefox
-        treeherder:
-            symbol: UV(UV)
-            platform: osx-cross/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: macosx64-shippable
 
     devedition-linux64:
         description: linux64 update verify
         shipping-product: devedition
-        treeherder:
-            symbol: UV(UV)
-            platform: linux64-devedition/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: linux64-devedition-nightly
 
     devedition-linux:
         description: linux update verify
         shipping-product: devedition
-        treeherder:
-            symbol: UV(UV)
-            platform: linux32-devedition/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: linux-devedition-nightly
 
     devedition-win64:
         description: win64 update verify
         shipping-product: devedition
-        treeherder:
-            symbol: UV(UV)
-            platform: windows2012-64-devedition/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: win64-devedition-nightly
 
     devedition-win64-aarch64:
         description: win64-aarch64 update verify
         shipping-product: devedition
-        treeherder:
-            symbol: UV(UV)
-            platform: windows2012-aarch64-devedition/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: win64-aarch64-devedition-nightly
 
     devedition-win32:
         description: win32 update verify
         shipping-product: devedition
-        treeherder:
-            symbol: UV(UV)
-            platform: windows2012-32-devedition/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: win32-devedition-nightly
 
     devedition-macosx64:
         description: macosx64 update verify
         shipping-product: devedition
-        treeherder:
-            symbol: UV(UV)
-            platform: osx-cross-devedition/opt
-            kind: test
-            tier: 1
         attributes:
             build_platform: macosx64-devedition-nightly
--- a/taskcluster/taskgraph/transforms/update_verify.py
+++ b/taskcluster/taskgraph/transforms/update_verify.py
@@ -5,17 +5,17 @@
 Transform the beetmover task into an actual task description.
 """
 
 from __future__ import absolute_import, print_function, unicode_literals
 
 from copy import deepcopy
 
 from taskgraph.transforms.base import TransformSequence
-from taskgraph.util.treeherder import add_suffix
+from taskgraph.util.treeherder import add_suffix, inherit_treeherder_from_dep
 
 transforms = TransformSequence()
 
 
 @transforms.add
 def add_command(config, tasks):
     config_tasks = {}
     for dep in config.kind_dependencies_tasks:
@@ -26,16 +26,17 @@ def add_command(config, tasks):
         config_task = config_tasks[task['name']]
         total_chunks = task["extra"]["chunks"]
         task['worker'].setdefault('env', {}).update(
             CHANNEL=config_task.task['extra']['channel'],
         )
         task.setdefault('fetches', {})[config_task.label] = [
             "update-verify.cfg",
         ]
+        task['treeherder'] = inherit_treeherder_from_dep(task, config_task)
 
         for this_chunk in range(1, total_chunks+1):
             chunked = deepcopy(task)
             chunked["treeherder"]["symbol"] = add_suffix(
                 chunked["treeherder"]["symbol"], this_chunk)
             chunked["label"] = "release-update-verify-{}-{}/{}".format(
                 chunked["name"], this_chunk, total_chunks
             )