blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Fixes #5156; Don't publish o.m.fenix[!.nightly] to nightly index (#5157)

master
Mitchell Hentges 2019-09-06 08:01:02 -07:00 committed by GitHub
parent c8d622c43d
commit 7d023fefc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
automation/taskcluster/decision_task.py
View File

@ -187,8 +187,8 @@ def nightly_to_production_app(is_staging, version_name):
build_task_id, build_task_id,
taskcluster_apk_paths, taskcluster_apk_paths,
channel='production', # Since we're publishing to the "production" app, we need to sign for production channel='production', # Since we're publishing to the "production" app, we need to sign for production
index_channel='nightly',
is_staging=is_staging, is_staging=is_staging,
publish_to_index=False,
) )
push_task_id = taskcluster.slugId() push_task_id = taskcluster.slugId()

13
automation/taskcluster/lib/tasks.py
View File

@ -468,20 +468,21 @@ class TaskBuilder(object):
) )
def craft_release_signing_task( def craft_release_signing_task(
self, build_task_id, apk_paths, channel, is_staging, index_channel=None self, build_task_id, apk_paths, channel, is_staging, publish_to_index=True
): ):
index_channel = index_channel or channel if publish_to_index:
staging_prefix = '.staging' if is_staging else '' staging_prefix = '.staging' if is_staging else ''
routes = [ routes = [
"index.project.mobile.fenix.v2{}.{}.{}.{}.{}.latest".format( "index.project.mobile.fenix.v2{}.{}.{}.{}.{}.latest".format(
staging_prefix, index_channel, self.date.year, self.date.month, self.date.day staging_prefix, channel, self.date.year, self.date.month, self.date.day
), ),
"index.project.mobile.fenix.v2{}.{}.{}.{}.{}.revision.{}".format( "index.project.mobile.fenix.v2{}.{}.{}.{}.{}.revision.{}".format(
staging_prefix, index_channel, self.date.year, self.date.month, self.date.day, self.commit staging_prefix, channel, self.date.year, self.date.month, self.date.day, self.commit
), ),
"index.project.mobile.fenix.v2{}.{}.latest".format(staging_prefix, index_channel), "index.project.mobile.fenix.v2{}.{}.latest".format(staging_prefix, channel),
] ]
else:
routes = []
capitalized_channel = upper_case_first_letter(channel) capitalized_channel = upper_case_first_letter(channel)
return self._craft_signing_task( return self._craft_signing_task(