bug 1398799: split update verify primary/secondary tasks into multiple kinds. r=aki
authorBen Hearsum <bhearsum@mozilla.com>
Wed, 07 Feb 2018 14:54:11 -0500
changeset 402856 4a0a54d663e0aea26a5194670718286c9d0bb2ef
parent 402855 644169ace322e06ba9ed3509216e1b78ed50133e
child 402857 e49f9b8dad9f304009173e071b791528934334ee
push id33405
push usershindli@mozilla.com
push dateThu, 08 Feb 2018 10:04:47 +0000
treeherdermozilla-central@0ac953fcddf1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki
bugs1398799
milestone60.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 1398799: split update verify primary/secondary tasks into multiple kinds. r=aki
taskcluster/ci/release-secondary-update-verify/kind.yml
taskcluster/ci/release-update-verify/kind.yml
taskcluster/docs/kinds.rst
taskcluster/taskgraph/target_tasks.py
new file mode 100644
--- /dev/null
+++ b/taskcluster/ci/release-secondary-update-verify/kind.yml
@@ -0,0 +1,169 @@
+# 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.transform:loader
+
+kind-dependencies:
+   - post-balrog-dummy
+   - post-beetmover-dummy
+   - release-updates-builder
+
+transforms:
+   - taskgraph.transforms.release_deps:transforms
+   - taskgraph.transforms.update_verify:transforms
+   - taskgraph.transforms.task:transforms
+
+job-defaults:
+   name: secondary-update-verify
+   run-on-projects: []  # to make sure this never runs as part of CI
+   shipping-phase: promote
+   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker:
+      implementation: docker-worker
+      os: linux
+      docker-image:
+         in-tree: "update-verify"
+      max-run-time: 7200
+      retry-exit-status:
+         - 255
+      env:
+         NO_BBCONFIG: "1"
+         BUILD_TOOLS_REPO:
+            by-project:
+               jamun: https://hg.mozilla.org/users/stage-ffxbld/tools
+               maple: https://hg.mozilla.org/users/asasaki_mozilla.com/tools
+               default: https://hg.mozilla.org/build/tools
+         CHANNEL:
+            by-project:
+               mozilla-release: "beta-localtest"
+               default: "default"
+   extra:
+      chunks: 12
+   notifications:
+      completed:
+         subject: "COMPLETED: [{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]}] {task_def[metadata][name]} task"
+         message: "COMPLETED: [{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]}] {task_def[metadata][name]} task"
+         plugins:
+            by-project:
+               mozilla-beta: ["log_collect"]
+               mozilla-release: ["log_collect"]
+               default: []
+
+      failed:
+         subject: "FAILED: [{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]}] {task_def[metadata][name]} task"
+         message: "FAILED: [{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]}] {task_def[metadata][name]} task"
+         plugins:
+            by-project:
+               mozilla-beta: ["log_collect", "ses"]
+               mozilla-release: ["log_collect", "ses"]
+               default: ["ses"]
+         emails:
+            by-project:
+               mozilla-beta: ["release-automation-notifications@mozilla.com"]
+               mozilla-release: ["release-automation-notifications@mozilla.com"]
+               try: ["{task_def[metadata][owner]}"]
+               maple: ["release+tcstaging@mozilla.com"]
+               default: []
+
+      exception:
+         subject: "EXCEPTION: [{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]}] {task_def[metadata][name]} task"
+         message: "EXCEPTION: [{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]}] {task_def[metadata][name]} task"
+         plugins:
+            by-project:
+               mozilla-beta: ["log_collect", "ses"]
+               mozilla-release: ["log_collect", "ses"]
+               default: ["ses"]
+         emails:
+            by-project:
+               mozilla-beta: ["release-automation-notifications@mozilla.com"]
+               mozilla-release: ["release-automation-notifications@mozilla.com"]
+               try: ["{task_def[metadata][owner]}"]
+               maple: ["release+tcstaging@mozilla.com"]
+               default: []
+
+jobs:
+   firefox-secondary-linux64:
+      description: linux64 secondary channel update verify
+      shipping-product: firefox
+      worker:
+         env:
+            VERIFY_CONFIG:
+               by-project:
+                  mozilla-release: "beta-firefox-linux64.cfg"
+                  default: "none"
+      treeherder:
+         symbol: UVS
+         platform: linux64/opt
+         kind: test
+         tier: 1
+      attributes:
+         build_platform: linux64
+
+   firefox-secondary-linux:
+      description: linux secondary channel update verify
+      shipping-product: firefox
+      worker:
+         env:
+            VERIFY_CONFIG:
+               by-project:
+                  mozilla-release: "beta-firefox-linux.cfg"
+                  default: "none"
+      treeherder:
+         symbol: UVS
+         platform: linux/opt
+         kind: test
+         tier: 1
+      attributes:
+         build_platform: linux
+
+   firefox-secondary-win64:
+      description: win64 secondary channel update verify
+      shipping-product: firefox
+      worker:
+         env:
+            VERIFY_CONFIG:
+               by-project:
+                  mozilla-release: "beta-firefox-win64.cfg"
+                  default: "none"
+      treeherder:
+         symbol: UVS
+         platform: win64/opt
+         kind: test
+         tier: 1
+      attributes:
+         build_platform: win64
+
+   firefox-secondary-win32:
+      description: win32 secondary channel update verify
+      shipping-product: firefox
+      worker:
+         env:
+            VERIFY_CONFIG:
+               by-project:
+                  mozilla-release: "beta-firefox-win32.cfg"
+                  default: "none"
+      treeherder:
+         symbol: UVS
+         platform: win32/opt
+         kind: test
+         tier: 1
+      attributes:
+         build_platform: win32
+
+   firefox-secondary-macosx64:
+      description: macosx64 secondary channel update verify
+      shipping-product: firefox
+      worker:
+         env:
+            VERIFY_CONFIG:
+               by-project:
+                  mozilla-release: "beta-firefox-macosx64.cfg"
+                  default: "none"
+      treeherder:
+         symbol: UVS
+         platform: macosx64/opt
+         kind: test
+         tier: 1
+      attributes:
+         build_platform: macosx64
--- a/taskcluster/ci/release-update-verify/kind.yml
+++ b/taskcluster/ci/release-update-verify/kind.yml
@@ -219,121 +219,16 @@ jobs:
       treeherder:
          symbol: UV
          platform: macosx64/opt
          kind: test
          tier: 1
       attributes:
          build_platform: macosx64
 
-   firefox-secondary-linux64:
-      description: linux64 secondary channel update verify
-      shipping-product: firefox
-      worker:
-         env:
-            CHANNEL:
-               by-project:
-                  mozilla-release: "beta-localtest"
-                  default: "default"
-            VERIFY_CONFIG:
-               by-project:
-                  mozilla-release: "beta-firefox-linux64.cfg"
-                  default: "none"
-      treeherder:
-         symbol: UVS
-         platform: linux64/opt
-         kind: test
-         tier: 1
-      attributes:
-         build_platform: linux64
-
-   firefox-secondary-linux:
-      description: linux secondary channel update verify
-      shipping-product: firefox
-      worker:
-         env:
-            CHANNEL:
-               by-project:
-                  mozilla-release: "beta-localtest"
-                  default: "default"
-            VERIFY_CONFIG:
-               by-project:
-                  mozilla-release: "beta-firefox-linux.cfg"
-                  default: "none"
-      treeherder:
-         symbol: UVS
-         platform: linux/opt
-         kind: test
-         tier: 1
-      attributes:
-         build_platform: linux
-
-   firefox-secondary-win64:
-      description: win64 secondary channel update verify
-      shipping-product: firefox
-      worker:
-         env:
-            CHANNEL:
-               by-project:
-                  mozilla-release: "beta-localtest"
-                  default: "default"
-            VERIFY_CONFIG:
-               by-project:
-                  mozilla-release: "beta-firefox-win64.cfg"
-                  default: "none"
-      treeherder:
-         symbol: UVS
-         platform: win64/opt
-         kind: test
-         tier: 1
-      attributes:
-         build_platform: win64
-
-   firefox-secondary-win32:
-      description: win32 secondary channel update verify
-      shipping-product: firefox
-      worker:
-         env:
-            CHANNEL:
-               by-project:
-                  mozilla-release: "beta-localtest"
-                  default: "default"
-            VERIFY_CONFIG:
-               by-project:
-                  mozilla-release: "beta-firefox-win32.cfg"
-                  default: "none"
-      treeherder:
-         symbol: UVS
-         platform: win32/opt
-         kind: test
-         tier: 1
-      attributes:
-         build_platform: win32
-
-   firefox-secondary-macosx64:
-      description: macosx64 secondary channel update verify
-      shipping-product: firefox
-      worker:
-         env:
-            CHANNEL:
-               by-project:
-                  mozilla-release: "beta-localtest"
-                  default: "default"
-            VERIFY_CONFIG:
-               by-project:
-                  mozilla-release: "beta-firefox-macosx64.cfg"
-                  default: "none"
-      treeherder:
-         symbol: UVS
-         platform: macosx64/opt
-         kind: test
-         tier: 1
-      attributes:
-         build_platform: macosx64
-
    devedition-linux64:
       description: linux64 update verify
       shipping-product: devedition
       worker:
          env:
             CHANNEL:
                by-project:
                   jamun: "aurora-localtest"
--- a/taskcluster/docs/kinds.rst
+++ b/taskcluster/docs/kinds.rst
@@ -290,16 +290,20 @@ Verifies the contents and package of rel
 release-secondary-balrog-publishing
 ---------------------
 Schedule an RC release to go live in Balrog. Usually this will happen on the beta channel, to a smaller audience, before the RC goes live on the release channel.
 
 release-update-verify
 ---------------------
 Verifies the contents and package of release update MARs.
 
+release-secondary-update-verify
+---------------------
+Verifies the contents and package of release update MARs.
+
 release-updates-builder
 -----------------------
 Top level Balrog blob submission & patcher/update verify config updates.
 
 release-uptake-monitoring
 -------------------------
 Run uptake monitoring for releases.
 
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -328,21 +328,19 @@ def target_tasks_promote_firefox(full_ta
         # At some point this should filter by shipping_phase == 'build' and
         # shipping_product matches.
         if task.label in beta_release_tasks:
             return True
 
         # 'secondary' update/final verify tasks only run for
         # RCs
         if parameters.get('release_type') != 'rc':
-            if task.kind in ('release-buildbot-update-verify',
-                             'release-update-verify',
+            if task.kind in ('release-secondary-update-verify',
                              'release-secondary-final-verify'):
-                if 'secondary' in task.label:
-                    return False
+                return False
 
         if task.attributes.get('shipping_product') == 'firefox' and \
                 task.attributes.get('shipping_phase') == 'promote':
             return True
 
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]