Fixes nightly scope using build type instead of channel
This commit is contained in:
parent
48be48d1b8
commit
f2affcc6b4
|
@ -124,7 +124,7 @@ def release(channel, engine, is_staging, version_name):
|
||||||
push_tasks = {}
|
push_tasks = {}
|
||||||
|
|
||||||
build_task_id = taskcluster.slugId()
|
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_task_id = taskcluster.slugId()
|
||||||
signing_tasks[signing_task_id] = BUILDER.craft_release_signing_task(
|
signing_tasks[signing_task_id] = BUILDER.craft_release_signing_task(
|
||||||
|
|
|
@ -46,11 +46,11 @@ class TaskBuilder(object):
|
||||||
self.date = arrow.get(date_string)
|
self.date = arrow.get(date_string)
|
||||||
self.trust_level = trust_level
|
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:
|
if is_staging:
|
||||||
secret_index = 'garbage/staging/project/mobile/fenix'
|
secret_index = 'garbage/staging/project/mobile/fenix'
|
||||||
else:
|
else:
|
||||||
secret_index = 'project/mobile/fenix/{}'.format(variant.build_type)
|
secret_index = 'project/mobile/fenix/{}'.format(channel)
|
||||||
|
|
||||||
pre_gradle_commands = (
|
pre_gradle_commands = (
|
||||||
'python automation/taskcluster/helper/get-secret.py -s {} -k {} -f {}'.format(
|
'python automation/taskcluster/helper/get-secret.py -s {} -k {} -f {}'.format(
|
||||||
|
|
Loading…
Reference in New Issue
Block a user