Bug 1456234: [release] Use release platforms for source; r=aki

Differential Revision: https://phabricator.services.mozilla.com/D1055

--HG--
extra : rebase_source : 3ac38ac3b178a8f0d738295d8385643945aa3fb1
This commit is contained in:
Tom Prince 2018-04-26 21:24:58 -06:00
parent 3d579a1b7c
commit 72bd9cbbd3
4 changed files with 33 additions and 31 deletions

View File

@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
loader: taskgraph.loader.build_signing:loader
loader: taskgraph.loader.single_dep:loader
transforms:
- taskgraph.transforms.name_sanity:transforms

View File

@ -37,22 +37,26 @@ job-defaults:
tooltool-downloads: public
need-xvfb: false
run-on-projects: []
# The build_attrs transform defaults to setting a `skip-unlles-schedules'
# optimization based on the task label. The tasks here don't have corresponding
# schedules defined in mozbuild.
optimization: {}
jobs:
linux64-source/opt:
firefox-source/opt:
description: "Firefox source builder"
treeherder:
platform: linux64/opt
platform: firefox-release/opt
shipping-product: firefox
linux64-fennec-source/opt:
fennec-source/opt:
description: "Fennec source builder"
treeherder:
platform: android-api-16/opt
platform: fennec-release/opt
shipping-product: fennec
linux64-devedition-source/opt:
devedition-source/opt:
description: "Devedition source builder"
treeherder:
platform: linux64-devedition-source/opt
platform: devedition-release/opt
shipping-product: devedition

View File

@ -144,12 +144,6 @@ UPSTREAM_ARTIFACT_UNSIGNED_PATHS = {
"host/bin/mar",
"host/bin/mbsdiff",
]),
'linux64-source': [
],
'linux64-devedition-source': [
],
'linux64-fennec-source': [
],
'android-x86-nightly': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US,
'android-aarch64-nightly': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US,
'android-api-16-nightly': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US,
@ -217,18 +211,6 @@ UPSTREAM_ARTIFACT_SIGNED_PATHS = {
"target.tar.bz2",
"target.tar.bz2.asc",
],
'linux64-source': [
"source.tar.xz",
"source.tar.xz.asc",
],
'linux64-devedition-source': [
"source.tar.xz",
"source.tar.xz.asc",
],
'linux64-fennec-source': [
"source.tar.xz",
"source.tar.xz.asc",
],
'android-x86-nightly': ["en-US/target.apk"],
'android-aarch64-nightly': ["en-US/target.apk"],
'android-api-16-nightly': ["en-US/target.apk"],
@ -294,6 +276,14 @@ UPSTREAM_ARTIFACT_SIGNED_PATHS = {
],
}
# Until bug 1331141 is fixed, if you are adding any new artifacts here that
# need to be transfered to S3, please be aware you also need to follow-up
# with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
# See example in bug 1348286
UPSTREAM_SOURCE_ARTIFACTS = [
"source.tar.xz",
"source.tar.xz.asc",
]
# Voluptuous uses marker objects as dictionary *keys*, but they are not
# comparable, so we cast all of the keys back to regular strings
@ -406,6 +396,17 @@ def generate_upstream_artifacts(job, signing_task_ref, build_task_ref, platform,
artifact_prefix = '{}/{}'.format(artifact_prefix, locale)
platform = "{}-l10n".format(platform)
if platform.endswith("-source"):
return [
{
"taskId": {"task-reference": signing_task_ref},
"taskType": "signing",
"paths": ["{}/{}".format(artifact_prefix, p)
for p in UPSTREAM_SOURCE_ARTIFACTS],
"locale": locale or "en-US",
}
]
upstream_artifacts = []
# Some platforms (like android-api-16-nightly-l10n) may not depend on any unsigned artifact
@ -450,11 +451,8 @@ def craft_release_properties(config, job):
params = config.params
build_platform = job['attributes']['build_platform']
build_platform = build_platform.replace('-nightly', '')
if 'fennec-source' in build_platform:
# XXX This case is hardcoded to match the current implementation in beetmover
build_platform = 'android-api-16'
else:
build_platform = build_platform.replace('-source', '')
if build_platform.endswith("-source"):
build_platform = build_platform.replace('-source', '-release')
# XXX This should be explicitly set via build attributes or something
if 'android' in job['label'] or 'fennec' in job['label']:

View File

@ -445,7 +445,7 @@ def get_release_config(config):
def get_signing_cert_scope_per_platform(build_platform, is_nightly, config):
if 'devedition' in build_platform:
return get_devedition_signing_cert_scope(config)
elif is_nightly or build_platform in ('linux64-source', 'linux64-fennec-source'):
elif is_nightly or build_platform in ('firefox-source', 'fennec-source'):
return get_signing_cert_scope(config)
else:
return add_scope_prefix(config, 'signing:cert:dep-signing')