Bug 1466627 - tweak mark-as-shipped to new structure. r=rail a=release
authorMihai Tabara <mtabara@mozilla.com>
Fri, 01 Jun 2018 17:41:22 -0700
changeset 424328 cd6a2bf68078aa9bf41f22ddf7f71865c32458ac
parent 424327 07f5533a9986bf1efd6afeae0db15f32046b5885
child 424329 8f49b2a0e003fe63da04aab9714ddc62bcb7a65c
child 424362 df70300f00cd0f8dd9d8bde5e82074bcadb3e9c3
push id34201
push usershindli@mozilla.com
push dateThu, 28 Jun 2018 21:54:04 +0000
treeherdermozilla-central@8f49b2a0e003 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrail, release
bugs1466627
milestone63.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 1466627 - tweak mark-as-shipped to new structure. r=rail a=release MozReview-Commit-ID: 6iFYXX8EbJz
taskcluster/ci/release-mark-as-shipped/kind.yml
taskcluster/docs/kinds.rst
taskcluster/taskgraph/transforms/task.py
--- a/taskcluster/ci/release-mark-as-shipped/kind.yml
+++ b/taskcluster/ci/release-mark-as-shipped/kind.yml
@@ -20,23 +20,31 @@ job-defaults:
    worker-type:
       by-project:
          mozilla-central: scriptworker-prov-v1/shipit-v1
          mozilla-beta: scriptworker-prov-v1/shipit-v1
          mozilla-release: scriptworker-prov-v1/shipit-v1
          mozilla-esr60: scriptworker-prov-v1/shipit-v1
          default: scriptworker-prov-v1/shipit-dev
    worker:
-      implementation: shipit
+      implementation: shipit-shipped
    scopes:
       by-project:
-         mozilla-beta: ['project:releng:ship-it:production']
-         mozilla-release: ['project:releng:ship-it:production']
-         mozilla-esr60: ['project:releng:ship-it:production']
-         default: ['project:releng:ship-it:staging']
+         mozilla-beta:
+            - project:releng:ship-it:server:production
+            - project:releng:ship-it:action:mark-as-shipped
+         mozilla-release:
+            - project:releng:ship-it:server:production
+            - project:releng:ship-it:action:mark-as-shipped
+         mozilla-esr60:
+            - project:releng:ship-it:server:production
+            - project:releng:ship-it:action:mark-as-shipped
+         default:
+            - project:releng:ship-it:server:staging
+            - project:releng:ship-it:action:mark-as-shipped
    run-on-projects: []
    shipping-phase: ship
 
 jobs:
    fennec:
       name: release-fennec_mark_as_shipped
       shipping-product: fennec
 
--- a/taskcluster/docs/kinds.rst
+++ b/taskcluster/docs/kinds.rst
@@ -295,17 +295,17 @@ release-notify-promote
 Notify when a release has been promoted.
 
 release-bouncer-sub
 -------------------
 Submits bouncer updates for releases.
 
 release-mark-as-shipped
 -----------------------
-Marks releases as shipped in Ship-It.
+Marks releases as shipped in Ship-It v1
 
 release-bouncer-aliases
 -----------------------
 Update Bouncer's (download.mozilla.org) "latest" aliases.
 
 bouncer-check
 -------------
 Checks Bouncer (download.mozilla.org) uptake.
--- a/taskcluster/taskgraph/transforms/task.py
+++ b/taskcluster/taskgraph/transforms/task.py
@@ -566,17 +566,17 @@ task_description_schema = Schema({
         Required('implementation'): 'sign-and-push-addons',
         Required('channel'): Any('listed', 'unlisted'),
         Required('upstream-artifacts'): [{
             Required('taskId'): taskref_or_string,
             Required('taskType'): basestring,
             Required('paths'): [basestring],
         }],
     }, {
-        Required('implementation'): 'shipit',
+        Required('implementation'): 'shipit-shipped',
         Required('release-name'): basestring,
     }, {
         Required('implementation'): 'treescript',
         Required('tags'): [Any('buildN', 'release', None)],
         Required('bump'): bool,
         Optional('bump-files'): [basestring],
         Optional('repo-param-prefix'): basestring,
         Required('force-dry-run', default=True): bool,
@@ -1138,18 +1138,18 @@ def build_push_apk_payload(config, task,
 def build_push_snap_payload(config, task, task_def):
     worker = task['worker']
 
     task_def['payload'] = {
         'upstreamArtifacts':  worker['upstream-artifacts'],
     }
 
 
-@payload_builder('shipit')
-def build_ship_it_payload(config, task, task_def):
+@payload_builder('shipit-shipped')
+def build_ship_it_shipped_payload(config, task, task_def):
     worker = task['worker']
 
     task_def['payload'] = {
         'release_name': worker['release-name']
     }
 
 
 @payload_builder('sign-and-push-addons')