From f2affcc6b4e58fc8b7eecffba4df3a2cc028e724 Mon Sep 17 00:00:00 2001 From: Mitchell Hentges Date: Wed, 21 Aug 2019 15:19:54 -0700 Subject: [PATCH] Fixes nightly scope using build type instead of channel --- automation/taskcluster/decision_task.py | 2 +- automation/taskcluster/lib/tasks.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/automation/taskcluster/decision_task.py b/automation/taskcluster/decision_task.py index 3b8a3d1c8..b8da8b7d7 100644 --- a/automation/taskcluster/decision_task.py +++ b/automation/taskcluster/decision_task.py @@ -124,7 +124,7 @@ def release(channel, engine, is_staging, version_name): push_tasks = {} build_task_id = taskcluster.slugId() - build_tasks[build_task_id] = BUILDER.craft_assemble_release_task(variant, is_staging, version_name) + build_tasks[build_task_id] = BUILDER.craft_assemble_release_task(variant, channel, is_staging, version_name) signing_task_id = taskcluster.slugId() signing_tasks[signing_task_id] = BUILDER.craft_release_signing_task( diff --git a/automation/taskcluster/lib/tasks.py b/automation/taskcluster/lib/tasks.py index 6c5f62d8a..bc5ae7630 100644 --- a/automation/taskcluster/lib/tasks.py +++ b/automation/taskcluster/lib/tasks.py @@ -46,11 +46,11 @@ class TaskBuilder(object): self.date = arrow.get(date_string) self.trust_level = trust_level - def craft_assemble_release_task(self, variant, is_staging, version_name): + def craft_assemble_release_task(self, variant, channel, is_staging, version_name): if is_staging: secret_index = 'garbage/staging/project/mobile/fenix' else: - secret_index = 'project/mobile/fenix/{}'.format(variant.build_type) + secret_index = 'project/mobile/fenix/{}'.format(channel) pre_gradle_commands = ( 'python automation/taskcluster/helper/get-secret.py -s {} -k {} -f {}'.format(