bug 1433488 - require explicit shipping-phase in balrog+beetmover. r?bhearsum
MozReview-Commit-ID: Es6HuyiQPjZ
--- a/taskcluster/ci/balrog/kind.yml
+++ b/taskcluster/ci/balrog/kind.yml
@@ -13,8 +13,11 @@ transforms:
kind-dependencies:
- beetmover
- beetmover-l10n
- beetmover-repackage
only-for-attributes:
- nightly
- signed
+
+job-template:
+ shipping-phase: promote
--- a/taskcluster/ci/beetmover-l10n/kind.yml
+++ b/taskcluster/ci/beetmover-l10n/kind.yml
@@ -22,8 +22,11 @@ not-for-build-platforms:
- macosx64-nightly/opt
- win32-nightly/opt
- win64-nightly/opt
- linux-devedition-nightly/opt
- linux64-devedition-nightly/opt
- macosx64-devedition-nightly/opt
- win32-devedition-nightly/opt
- win64-devedition-nightly/opt
+
+job-template:
+ shipping-phase: promote
--- a/taskcluster/ci/beetmover/kind.yml
+++ b/taskcluster/ci/beetmover/kind.yml
@@ -22,8 +22,11 @@ not-for-build-platforms:
- macosx64-nightly/opt
- win32-nightly/opt
- win64-nightly/opt
- linux-devedition-nightly/opt
- linux64-devedition-nightly/opt
- macosx64-devedition-nightly/opt
- win32-devedition-nightly/opt
- win64-devedition-nightly/opt
+
+job-template:
+ shipping-phase: promote
--- a/taskcluster/taskgraph/transforms/balrog.py
+++ b/taskcluster/taskgraph/transforms/balrog.py
@@ -109,13 +109,13 @@ def make_task_description(config, jobs):
'implementation': 'balrog',
'upstream-artifacts': upstream_artifacts,
},
'scopes': [server_scope] + channel_scopes,
'dependencies': {'beetmover': dep_job.label},
'attributes': attributes,
'run-on-projects': dep_job.attributes.get('run_on_projects'),
'treeherder': treeherder,
- 'shipping-phase': job.get('shipping-phase', phase),
+ 'shipping-phase': job['shipping-phase'],
'shipping-product': job.get('shipping-product'),
}
yield task
--- a/taskcluster/taskgraph/transforms/beetmover.py
+++ b/taskcluster/taskgraph/transforms/beetmover.py
@@ -6,18 +6,17 @@ Transform the beetmover task into an act
"""
from __future__ import absolute_import, print_function, unicode_literals
from taskgraph.transforms.base import TransformSequence
from taskgraph.util.attributes import copy_attributes_from_dependent_job
from taskgraph.util.schema import validate_schema, Schema
from taskgraph.util.scriptworker import (get_beetmover_bucket_scope,
- get_beetmover_action_scope,
- get_phase)
+ get_beetmover_action_scope)
from taskgraph.transforms.task import task_description_schema
from voluptuous import Any, Required, Optional
# Until bug 1331141 is fixed, if you are adding any new artifacts here that
# need to be transfered to S3, please be aware you also need to follow-up
# with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
# See example in bug 1348286
@@ -326,17 +325,17 @@ beetmover_description_schema = Schema({
# treeherder is allowed here to override any defaults we use for beetmover. See
# taskcluster/taskgraph/transforms/task.py for the schema details, and the
# below transforms for defaults of various values.
Optional('treeherder'): task_description_schema['treeherder'],
# locale is passed only for l10n beetmoving
Optional('locale'): basestring,
- Optional('shipping-phase'): task_description_schema['shipping-phase'],
+ Required('shipping-phase'): task_description_schema['shipping-phase'],
Optional('shipping-product'): task_description_schema['shipping-product'],
})
@transforms.add
def validate(config, jobs):
for job in jobs:
label = job.get('dependent-task', object).__dict__.get('label', '?no-label?')
@@ -381,28 +380,27 @@ def make_task_description(config, jobs):
attributes = copy_attributes_from_dependent_job(dep_job)
if job.get('locale'):
attributes['locale'] = job['locale']
bucket_scope = get_beetmover_bucket_scope(config)
action_scope = get_beetmover_action_scope(config)
- phase = get_phase(config)
task = {
'label': label,
'description': description,
'worker-type': 'scriptworker-prov-v1/beetmoverworker-v1',
'scopes': [bucket_scope, action_scope],
'dependencies': dependencies,
'attributes': attributes,
'run-on-projects': dep_job.attributes.get('run_on_projects'),
'treeherder': treeherder,
- 'shipping-phase': phase,
+ 'shipping-phase': job['shipping-phase'],
}
yield task
def generate_upstream_artifacts(signing_task_ref, build_task_ref, platform,
locale=None):
build_mapping = UPSTREAM_ARTIFACT_UNSIGNED_PATHS
--- a/taskcluster/taskgraph/transforms/beetmover_l10n.py
+++ b/taskcluster/taskgraph/transforms/beetmover_l10n.py
@@ -27,10 +27,11 @@ def make_beetmover_description(config, j
treeherder = {
'symbol': join_symbol(group, symbol),
}
beet_description = {
'dependent-task': dep_job,
'treeherder': treeherder,
'locale': locale,
+ 'shipping-phase': job['shipping-phase'],
}
yield beet_description