diff --git a/taskcluster/ci/build-fat-aar/kind.yml b/taskcluster/ci/build-fat-aar/kind.yml index 8a62bb38e39b..ec94efe3cfde 100644 --- a/taskcluster/ci/build-fat-aar/kind.yml +++ b/taskcluster/ci/build-fat-aar/kind.yml @@ -63,19 +63,19 @@ job-defaults: tooltool-downloads: internal # Note: These settings are only honored by nightly (i.e. shipping) builds update-channel: - by-release-type: - nightly: nightly - nightly-oak: nightly-oak - nightly-pine: nightly-pine - beta: - by-shipping-product: - devedition: aurora - default: beta - release.*: release - esr.*: esr + by-project: + try: nightly-try default: - by-project: - try: nightly-try + by-release-type: + nightly: nightly + nightly-oak: nightly-oak + nightly-pine: nightly-pine + beta: + by-shipping-product: + devedition: aurora + default: beta + release.*: release + esr.*: esr default: null fetches: toolchain: diff --git a/taskcluster/ci/build/kind.yml b/taskcluster/ci/build/kind.yml index 46f772010adc..281eeabe4407 100644 --- a/taskcluster/ci/build/kind.yml +++ b/taskcluster/ci/build/kind.yml @@ -46,19 +46,19 @@ job-defaults: default: nightly # Note: These settings are only honored by nightly (i.e. shipping) builds update-channel: - by-release-type: - nightly: nightly - nightly-oak: nightly-oak - nightly-pine: nightly-pine - beta: - by-shipping-product: - devedition: aurora - default: beta - release.*: release - esr.*: esr + by-project: + try: nightly-try default: - by-project: - try: nightly-try + by-release-type: + nightly: nightly + nightly-oak: nightly-oak + nightly-pine: nightly-pine + beta: + by-shipping-product: + devedition: aurora + default: beta + release.*: release + esr.*: esr default: null # ACCEPTED_MAR_CHANNEL_IDS should usually be the same as the value MAR_CHANNEL_ID. # If more than one ID is needed, then you should use a comma separated list diff --git a/taskcluster/gecko_taskgraph/decision.py b/taskcluster/gecko_taskgraph/decision.py index 1e9f6999354f..db2224b9314d 100644 --- a/taskcluster/gecko_taskgraph/decision.py +++ b/taskcluster/gecko_taskgraph/decision.py @@ -54,6 +54,7 @@ PER_PROJECT_PARAMETERS = { "try": { "enable_always_target": True, "target_tasks_method": "try_tasks", + "release_type": "nightly", }, "kaios-try": { "target_tasks_method": "try_tasks", diff --git a/taskcluster/gecko_taskgraph/transforms/beetmover_apt.py b/taskcluster/gecko_taskgraph/transforms/beetmover_apt.py index 2dbed3a189b6..49836a1785f6 100644 --- a/taskcluster/gecko_taskgraph/transforms/beetmover_apt.py +++ b/taskcluster/gecko_taskgraph/transforms/beetmover_apt.py @@ -21,8 +21,7 @@ transforms = TransformSequence() def beetmover_apt(config, tasks): product = ( "firefox" - if not config.params["release_type"] # try - or config.params["release_type"] == "nightly" + if config.params["release_type"] == "nightly" else config.params["release_product"] ) filtered_tasks = filter_beetmover_apt_tasks(config, tasks, product)