Bug 1608874 - part 1: Move Fennec Beta to a dedicated hook (#11048)
parent
b332deedd4
commit
e3029d658a
|
@ -155,13 +155,10 @@ jobs:
|
||||||
|
|
||||||
fennec-production:
|
fennec-production:
|
||||||
attributes:
|
attributes:
|
||||||
# TODO replace `nightly: true` by `release-type: production` once the data migration
|
release-type: production
|
||||||
# testing is over
|
|
||||||
# TODO when making the above change, uncomment `filter-incomplete-translations: true`
|
|
||||||
nightly: true
|
|
||||||
include-release-version: true
|
include-release-version: true
|
||||||
include-shippable-secrets: true
|
include-shippable-secrets: true
|
||||||
# filter-incomplete-translations: true
|
filter-incomplete-translations: true
|
||||||
run:
|
run:
|
||||||
geckoview-engine: geckoBeta
|
geckoview-engine: geckoBeta
|
||||||
gradle-build-type: fennecProduction
|
gradle-build-type: fennecProduction
|
||||||
|
|
|
@ -19,6 +19,7 @@ group-by: build-type
|
||||||
only-for-build-types:
|
only-for-build-types:
|
||||||
- fennec-nightly
|
- fennec-nightly
|
||||||
- fennec-beta
|
- fennec-beta
|
||||||
|
- fennec-production
|
||||||
- nightly
|
- nightly
|
||||||
- beta
|
- beta
|
||||||
- production
|
- production
|
||||||
|
@ -27,11 +28,15 @@ job-template:
|
||||||
description: Publish Fenix
|
description: Publish Fenix
|
||||||
worker-type: push-apk
|
worker-type: push-apk
|
||||||
worker:
|
worker:
|
||||||
commit: true
|
commit:
|
||||||
|
by-build-type:
|
||||||
|
fennec-production: false
|
||||||
|
default: true
|
||||||
channel:
|
channel:
|
||||||
by-build-type:
|
by-build-type:
|
||||||
fennec-nightly: fennec-nightly
|
fennec-nightly: fennec-nightly
|
||||||
fennec-beta: fennec-beta
|
fennec-beta: fennec-beta
|
||||||
|
fennec-production: fennec-production
|
||||||
nightly: nightly
|
nightly: nightly
|
||||||
beta: beta
|
beta: beta
|
||||||
production: production
|
production: production
|
||||||
|
|
|
@ -58,11 +58,11 @@ def _filter_fennec(fennec_type, task, parameters):
|
||||||
return task.attributes.get("build-type", "") == "fennec-{}".format(fennec_type)
|
return task.attributes.get("build-type", "") == "fennec-{}".format(fennec_type)
|
||||||
|
|
||||||
|
|
||||||
@_target_task("fennec-beta")
|
@_target_task("fennec-production")
|
||||||
def target_tasks_fennec_nightly(full_task_graph, parameters, graph_config):
|
def target_tasks_fennec_nightly(full_task_graph, parameters, graph_config):
|
||||||
"""Select the set of tasks required for a beta build signed with the fennec key."""
|
"""Select the set of tasks required for a production build signed with the fennec key."""
|
||||||
|
|
||||||
return [l for l, t in full_task_graph.tasks.iteritems() if _filter_fennec("beta", t, parameters)]
|
return [l for l, t in full_task_graph.tasks.iteritems() if _filter_fennec("production", t, parameters)]
|
||||||
|
|
||||||
|
|
||||||
@_target_task("bump_android_components")
|
@_target_task("bump_android_components")
|
||||||
|
|
|
@ -18,7 +18,7 @@ transforms = TransformSequence()
|
||||||
@transforms.add
|
@transforms.add
|
||||||
def resolve_keys(config, tasks):
|
def resolve_keys(config, tasks):
|
||||||
for task in tasks:
|
for task in tasks:
|
||||||
for key in ("worker.channel", "worker.dep"):
|
for key in ("worker.channel", "worker.commit", "worker.dep"):
|
||||||
resolve_keyed_by(
|
resolve_keyed_by(
|
||||||
task,
|
task,
|
||||||
key,
|
key,
|
||||||
|
|
Loading…
Reference in New Issue