bug 1431799 - rename desktop_release_type -> release_type. r=bhearsum
This used to only be relevant to Devedition and Firefox releases.
In
bug 1433536 we're going to add RC Fennec releases. Let's rename
the parameter now, for less parameters churn.
MozReview-Commit-ID: 28e1Y5FG4On
--- a/taskcluster/docs/parameters.rst
+++ b/taskcluster/docs/parameters.rst
@@ -148,21 +148,20 @@ Release Promotion
Specify the version for release tasks.
``app_version``
Specify the application version for release tasks. For releases, this is often a less specific version number than ``version``.
``next_version``
Specify the next version for version bump tasks.
-``desktop_release_type``
- The type of desktop release being promoted. One of "beta", "devedition", "esr", "rc",
- or "release".
+``release_type``
+ The type of release being promoted. One of "beta", "devedition", "esr", "rc", or "release".
- ``release_eta``
+``release_eta``
The time and date when a release is scheduled to live. This value is passed to Balrog.
Comm Push Information
---------------------
These parameters correspond to the repository and revision of the comm-central
repository to checkout. Their meaning is the same as the corresponding
parameters for the gecko repository above. They are optional, but if any of
--- a/taskcluster/taskgraph/actions/release_promotion.py
+++ b/taskcluster/taskgraph/actions/release_promotion.py
@@ -39,22 +39,22 @@ RELEASE_PROMOTION_CONFIG = {
},
'ship_firefox': {
'target_tasks_method': 'ship_firefox',
'product': 'firefox',
},
'promote_firefox_rc': {
'target_tasks_method': 'promote_firefox',
'product': 'firefox',
- 'desktop_release_type': 'rc',
+ 'release_type': 'rc',
},
'ship_firefox_rc': {
'target_tasks_method': 'ship_firefox',
'product': 'firefox',
- 'desktop_release_type': 'rc',
+ 'release_type': 'rc',
},
'promote_devedition': {
'target_tasks_method': 'promote_devedition',
'product': 'devedition',
},
'push_devedition': {
'target_tasks_method': 'push_devedition',
'product': 'devedition',
@@ -298,17 +298,17 @@ def release_promotion_action(parameters,
parameters['existing_tasks'] = find_existing_tasks_from_previous_kinds(
combined_full_task_graph, previous_graph_ids, rebuild_kinds
)
parameters['do_not_optimize'] = do_not_optimize
parameters['target_tasks_method'] = target_tasks_method
parameters['build_number'] = int(input['build_number'])
parameters['next_version'] = next_version
parameters['release_history'] = release_history
- parameters['desktop_release_type'] = promotion_config.get('desktop_release_type', '')
+ parameters['release_type'] = promotion_config.get('release_type', '')
parameters['release_eta'] = input.get('release_eta', '')
if input['version']:
parameters['version'] = input['version']
# make parameters read-only
parameters = Parameters(**parameters)
taskgraph_decision({}, parameters=parameters)
--- a/taskcluster/taskgraph/decision.py
+++ b/taskcluster/taskgraph/decision.py
@@ -191,17 +191,17 @@ def get_decision_parameters(options):
'target_tasks_method',
]
parameters['existing_tasks'] = {}
parameters['do_not_optimize'] = []
parameters['build_number'] = 1
parameters['version'] = get_version()
parameters['app_version'] = get_app_version()
parameters['next_version'] = None
- parameters['desktop_release_type'] = ''
+ parameters['release_type'] = ''
parameters['release_eta'] = ''
# owner must be an email, but sometimes (e.g., for ffxbld) it is not, in which
# case, fake it
if '@' not in parameters['owner']:
parameters['owner'] += '@noreply.mozilla.org'
# use the pushdate as build_date if given, else use current time
--- a/taskcluster/taskgraph/parameters.py
+++ b/taskcluster/taskgraph/parameters.py
@@ -39,17 +39,16 @@ get_app_version = functools.partial(get_
# Please keep this list sorted and in sync with taskcluster/docs/parameters.rst
# Parameters are of the form: {name: default}
PARAMETERS = {
'app_version': get_app_version(),
'base_repository': 'https://hg.mozilla.org/mozilla-unified',
'build_date': lambda: int(time.time()),
'build_number': 1,
- 'desktop_release_type': '',
'do_not_optimize': [],
'existing_tasks': {},
'filters': ['check_servo', 'target_tasks_method'],
'head_ref': get_head_ref,
'head_repository': 'https://hg.mozilla.org/mozilla-central',
'head_rev': get_head_ref,
'include_nightly': False,
'level': '3',
@@ -58,16 +57,17 @@ PARAMETERS = {
'next_version': None,
'optimize_target_tasks': True,
'owner': 'nobody@mozilla.com',
'project': 'mozilla-central',
'pushdate': lambda: int(time.time()),
'pushlog_id': '0',
'release_eta': '',
'release_history': {},
+ 'release_type': '',
'target_tasks_method': 'default',
'try_mode': None,
'try_options': None,
'try_task_config': None,
'version': get_version(),
}
COMM_PARAMETERS = {
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -327,17 +327,17 @@ def target_tasks_promote_firefox(full_ta
# ``previous_graph_kinds``.
# 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('desktop_release_type') != 'rc':
+ if parameters.get('release_type') != 'rc':
if task.kind in ('release-buildbot-update-verify',
'release-update-verify',
'release-secondary-final-verify'):
if 'secondary' in task.label:
return False
if task.attributes.get('shipping_product') == 'firefox' and \
task.attributes.get('shipping_phase') == 'promote':
@@ -364,17 +364,17 @@ def target_tasks_push_firefox(full_task_
return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
@_target_task('ship_firefox')
def target_tasks_ship_firefox(full_task_graph, parameters, graph_config):
"""Select the set of tasks required to ship firefox.
Previous build deps will be optimized out via action task."""
- is_rc = (parameters.get('desktop_release_type') == 'rc')
+ is_rc = (parameters.get('release_type') == 'rc')
if is_rc:
# ship_firefox_rc runs after `promote` rather than `push`; include
# all promote tasks.
filtered_for_candidates = target_tasks_promote_firefox(
full_task_graph, parameters, graph_config,
)
else:
# ship_firefox runs after `push`; include all push tasks.
--- a/taskcluster/taskgraph/transforms/release_updates.py
+++ b/taskcluster/taskgraph/transforms/release_updates.py
@@ -32,13 +32,13 @@ def add_command(config, tasks):
)
for thing in ("generate_bz2_blob", "balrog_api_root", "channels", "repo_path"):
thing = "worker.properties.{}".format(thing)
resolve_keyed_by(real_task, thing, thing, **config.params)
# Non-RC builds from mozilla-release shouldn't use the beta channel.
if config.params.get('project') == 'mozilla-release':
- if config.params.get('desktop_release_type') != "rc":
+ if config.params.get('release_type') != "rc":
real_task["worker"]["properties"]["channels"] = \
real_task["worker"]["properties"]["channels"].replace("beta,", "")
yield real_task