Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-24 19:37:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 16 changesets (bug 1286092) for L10n bustages CLOSED TREE

Browse Source 
Backed out changeset ef828badfd93 (bug 1286092)
Backed out changeset 57a592e33f36 (bug 1286092)
Backed out changeset c9cf945aa4f9 (bug 1286092)
Backed out changeset d8c01d976acd (bug 1286092)
Backed out changeset 5d68dfd6325c (bug 1286092)
Backed out changeset 878e174255ff (bug 1286092)
Backed out changeset fa3e38422d49 (bug 1286092)
Backed out changeset fc6aebca89e3 (bug 1286092)
Backed out changeset f2271cd6af26 (bug 1286092)
Backed out changeset 7b828445f551 (bug 1286092)
Backed out changeset 5617053b1740 (bug 1286092)
Backed out changeset 556f54c5e209 (bug 1286092)
Backed out changeset db19ea492b02 (bug 1286092)
Backed out changeset 6eb40b38f9c9 (bug 1286092)
Backed out changeset 3eb4e39b9bcd (bug 1286092)
Backed out changeset b3c05f6e6a57 (bug 1286092)
This commit is contained in:
Bogdan Tara 2018-05-30 16:16:24 +03:00
parent b5825d891a
commit 933c5069bd
25 changed files with 114 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/confvars.sh
View File

@ -22,12 +22,6 @@ if test "$OS_ARCH" = "WINNT"; then
"$MOZ_UPDATE_CHANNEL" = "beta" -o \
"$MOZ_UPDATE_CHANNEL" = "release"; then
if ! test "$MOZ_DEBUG"; then
if ! test "$USE_STUB_INSTALLER"; then
# Expect USE_STUB_INSTALLER from taskcluster for downstream task consistency
echo "ERROR: STUB installer expected to be enabled but"
echo "ERROR: USE_STUB_INSTALLER is not specified in the environment"
exit 1
fi
MOZ_STUB_INSTALLER=1
fi
fi

47
browser/locales/l10n-onchange-changesets.json
View File

@ -1,47 +0,0 @@
{
"en-CA": {
"platforms": [
"linux",
"linux64",
"macosx64",
"win32",
"win64"
],
"revision": "default"
},
"he": {
"platforms": [
"linux",
"linux64",
"macosx64",
"win32",
"win64"
],
"revision": "default"
},
"it": {
"platforms": [
"linux",
"linux64",
"macosx64",
"win32",
"win64"
],
"revision": "default"
},
"ja": {
"platforms": [
"linux",
"linux64",
"win32",
"win64"
],
"revision": "default"
},
"ja-JP-mac": {
"platforms": [
"macosx64"
],
"revision": "default"
}
}

5
browser/locales/onchange-locales
View File

@ -1,5 +0,0 @@
en-CA
he
it
ja
ja-JP-mac

2
build/sparse-profiles/taskgraph
View File

@ -3,9 +3,7 @@
[include]
# These files are read as part of generating the taskgraph.
path:browser/locales/l10n-changesets.json
path:browser/locales/l10n-onchange-changesets.json
path:mobile/locales/l10n-changesets.json
path:mobile/locales/l10n-onchange-changesets.json
path:browser/locales/shipped-locales
path:browser/config/version_display.txt
path:browser/config/version.txt

34
mobile/locales/l10n-onchange-changesets.json
View File

@ -1,34 +0,0 @@
{
"en-CA": {
"platforms": [
"android",
"android-api-16",
"android-multilocale"
],
"revision": "default"
},
"he": {
"platforms": [
"android",
"android-api-16",
"android-multilocale"
],
"revision": "default"
},
"it": {
"platforms": [
"android",
"android-api-16",
"android-multilocale"
],
"revision": "default"
},
"ja": {
"platforms": [
"android",
"android-api-16",
"android-multilocale"
],
"revision": "default"
}
}

14
taskcluster/ci/build/windows.yml
View File

@ -266,13 +266,6 @@ win32-nightly/opt:
type: nightly
attributes:
nightly: true
stub-installer:
by-project:
default: false
mozilla-central: true
try: true
mozilla-beta: true
mozilla-release: true
shipping-phase: build
shipping-product: firefox
treeherder:
@ -636,13 +629,6 @@ win32-devedition-nightly/opt:
type: nightly
attributes:
nightly: true
stub-installer:
by-project:
default: false
mozilla-central: true
try: true
mozilla-beta: true
mozilla-release: true
shipping-phase: build
shipping-product: devedition
treeherder:

4
taskcluster/ci/config.yml
View File

@ -83,9 +83,13 @@ try:
# as different "platforms". These do *not* automatically ride along with "-p
# all"
ridealong-builds:
'android-api-16':
- 'android-api-16-l10n'
'linux':
- 'linux-l10n'
- 'sm-arm-sim-linux32'
'linux64':
- 'linux64-l10n'
- 'sm-plain-linux64'
- 'sm-nojit-linux64'
- 'sm-nonunified-linux64'

112
taskcluster/ci/l10n/kind.yml
View File

@ -19,19 +19,17 @@ only-for-build-platforms:
- linux64/opt
- linux/opt
- android-api-16/opt
- macosx64/opt
- win32/opt
- win64/opt
# - macosx64/opt
job-template:
description:
by-build-platform:
default: Localization
android-api-16: Single Locale Repack
android-api-16-l10n: Single Locale Repack
locales-file:
by-build-platform:
default: browser/locales/l10n-onchange-changesets.json
android-api-16: mobile/locales/l10n-onchange-changesets.json
default: browser/locales/l10n-changesets.json
android-api-16-l10n: mobile/locales/l10n-changesets.json
ignore-locales:
by-build-platform:
# OSX has a special locale for japanese
@ -40,124 +38,65 @@ job-template:
run-time:
by-build-platform:
default: 36000
android-api-16: 18000
android-api-16-l10n: 18000
docker-image:
by-build-platform:
android-api-16:
android-api-16-l10n:
in-tree: android-build
default: null
secrets:
by-build-platform:
default: false
android-api-16: true
android-api-16-l10n: true
toolchains:
by-build-platform:
default: []
macosx64:
- linux64-libdmg
- linux64-hfsplus
android-api-16:
android-api-16-l10n:
- android-gradle-dependencies
- android-sdk-linux
tooltool:
by-build-platform:
default: internal
linux.*: public
index:
type: l10n
product:
by-build-platform:
default: firefox
android-api-16: mobile
job-name:
by-build-platform:
linux: linux-opt
linux64: linux64-opt
macosx64: macosx64-opt
win32: win32-opt
win64: win64-opt
android-api-16: android-api-16-opt
run-on-projects: ['all']
default: public
android-api-16-l10n: internal
macosx64-nightly: internal
worker-type:
by-build-platform:
default: aws-provisioner-v1/gecko-{level}-b-linux
android-api-16: aws-provisioner-v1/gecko-{level}-b-android
win.*: aws-provisioner-v1/gecko-{level}-b-win2012
android: aws-provisioner-v1/gecko-{level}-b-android
treeherder:
symbol: L10n
tier: 3
platform:
by-build-platform:
linux64: linux64/opt
linux: linux32/opt
linux64-l10n: linux64/opt
linux-l10n: linux32/opt
macosx64: osx-cross/opt
win32: windows2012-32/opt
win64: windows2012-64/opt
android-api-16: android-4-0-armv7-api16/opt
env:
by-build-platform:
linux.*: # linux64 and 32 get same treatment here
EN_US_PACKAGE_NAME: target.tar.bz2
EN_US_BINARY_URL:
task-reference: https://queue.taskcluster.net/v1/task/<signed-build>/artifacts/{artifact_prefix}
MAR_TOOLS_URL:
task-reference: https://queue.taskcluster.net/v1/task/<unsigned-build>/artifacts/{artifact_prefix}/host/bin
macosx64:
EN_US_PACKAGE_NAME: target.dmg
EN_US_BINARY_URL:
task-reference: https://queue.taskcluster.net/v1/task/<repackage>/artifacts/{artifact_prefix}
MAR_TOOLS_URL:
task-reference: https://queue.taskcluster.net/v1/task/<unsigned-build>/artifacts/{artifact_prefix}/host/bin
win.*:
EN_US_PACKAGE_NAME: target.zip
EN_US_BINARY_URL:
task-reference: https://queue.taskcluster.net/v1/task/<signed-build>/artifacts/{artifact_prefix}
EN_US_INSTALLER_BINARY_URL:
task-reference: https://queue.taskcluster.net/v1/task/<repackage-signed>/artifacts/{artifact_prefix}
MAR_TOOLS_URL:
task-reference: https://queue.taskcluster.net/v1/task/<unsigned-build>/artifacts/{artifact_prefix}/host/bin
android-api-16:
EN_US_PACKAGE_NAME: target.apk
EN_US_BINARY_URL:
task-reference: https://queue.taskcluster.net/v1/task/<unsigned-build>/artifacts/{artifact_prefix}
android-api-16-l10n: android-4-0-armv7-api16/opt
mozharness:
config:
by-build-platform:
linux:
linux-l10n:
- single_locale/{project}.py
- single_locale/linux32.py
- single_locale/tc_common.py
- single_locale/tc_linux32.py
- single_locale/onchange.py
linux64:
linux64-l10n:
- single_locale/{project}.py
- single_locale/linux64.py
- single_locale/tc_common.py
- single_locale/tc_linux64.py
- single_locale/onchange.py
macosx64:
- single_locale/{project}.py
- single_locale/macosx64.py
- single_locale/tc_common.py
- single_locale/tc_macosx64.py
- single_locale/onchange.py
win32:
- single_locale/{project}.py
- single_locale/win32.py
- single_locale/tc_common.py
- single_locale/tc_win32.py
- single_locale/onchange.py
win64:
- single_locale/{project}.py
- single_locale/win64.py
- single_locale/tc_common.py
- single_locale/tc_win64.py
- single_locale/onchange.py
android-api-16:
android-api-16-l10n:
- single_locale/{project}_android-api-16.py
- single_locale/tc_common.py
- single_locale/tc_android-api-16.py
- single_locale/onchange.py
# no default, so we fail on new entries
options:
- revision=$GECKO_HEAD_REV
@ -165,19 +104,18 @@ job-template:
- this-chunk=1
actions:
by-build-platform:
default: ['clone-locales', 'list-locales', 'setup', 'repack',
'summary']
android-api-16: ['get-secrets',
'clone-locales', 'list-locales', 'setup', 'repack',
'upload-repacks', 'summary']
default: [clone-locales list-locales setup repack summary]
android-api-16-l10n: [get-secrets
clone-locales list-locales setup repack
upload-repacks summary]
script:
by-build-platform:
default: mozharness/scripts/desktop_l10n.py
android-api-16: mozharness/scripts/mobile_l10n.py
android-api-16-l10n: mozharness/scripts/mobile_l10n.py
when:
files-changed:
- browser/locales/l10n-onchange-changesets.json
- mobile/locales/l10n-onchange-changesets.json
- browser/locales/l10n-changesets.json
- mobile/locales/l10n-changesets.json
- testing/mozharness/configs/single_locale/**
- testing/mozharness/mozharness/mozilla/l10n/locales.py
- testing/mozharness/scripts/desktop_l10n.py

2
taskcluster/ci/repackage-signing/kind.yml
View File

@ -24,7 +24,5 @@ only-for-build-platforms:
- macosx64-devedition-nightly/opt
- win32-nightly/opt
- win32-devedition-nightly/opt
- win32/opt
- win64-nightly/opt
- win64-devedition-nightly/opt
- win64/opt

15
taskcluster/ci/repackage/kind.yml
View File

@ -19,32 +19,27 @@ kind-dependencies:
only-for-build-platforms:
- linux-nightly/opt
- linux-devedition-nightly/opt
- linux/opt
- linux64-nightly/opt
- linux64-devedition-nightly/opt
- linux64-asan-reporter-nightly/opt
- linux64/opt
- macosx64-nightly/opt
- macosx64-devedition-nightly/opt
- macosx64/opt
- win32-nightly/opt
- win32-devedition-nightly/opt
- win32/opt
- win64-nightly/opt
- win64-devedition-nightly/opt
- win64/opt
job-template:
mozharness:
config:
by-build-platform:
linux\b.*:
linux-.*:
- repackage/linux32_signed.py
linux64\b.*:
linux64-.*:
- repackage/linux64_signed.py
macosx64\b.*:
macosx64-.*:
- repackage/osx_signed.py
win32\b.*:
win32-.*:
- repackage/win32_signed.py
win64\b.*:
win64-.*:
- repackage/win64_signed.py

5
taskcluster/docs/attributes.rst
View File

@ -166,11 +166,6 @@ signed
======
Signals that the output of this task contains signed artifacts.
stub-installer
==============
Signals to the build system that this build is expected to have a stub installer
present, and informs followon tasks to expect it.
repackage_type
==============
This is the type of repackage. Can be ``repackage`` or

2
taskcluster/taskgraph/loader/build_signing.py
View File

@ -13,8 +13,6 @@ NON_NIGHTLY_LABELS_WHICH_SHOULD_SIGN_BUILDS = (
'build-win64/debug', 'build-win64/opt', 'build-win64/pgo',
'build-win32-devedition/opt', 'build-win64-devedition/opt',
'build-win64-ccov/debug',
'build-linux/opt', 'build-linux64/opt', 'build-macosx64/opt',
'build-android-api-16/opt'
'release-source-linux64-source/opt',
'release-source-linux64-fennec-source/opt',
'release-source-linux64-devedition-source/opt',

3
taskcluster/taskgraph/target_tasks.py
View File

@ -69,9 +69,6 @@ def filter_beta_release_tasks(task, parameters, ignore_kinds=None, allow_l10n=Fa
'macosx64',
'win32', 'win64',
):
if task.attributes['kind'] == 'l10n':
# This is on-change l10n
return True
if task.attributes['build_type'] == 'opt' and \
task.attributes.get('unittest_suite') != 'talos' and \
task.attributes.get('unittest_suite') != 'raptor':

6
taskcluster/taskgraph/transforms/beetmover_repackage.py
View File

@ -289,8 +289,10 @@ def generate_upstream_artifacts(job, build_task_ref, build_signing_task_ref,
if paths:
usable_paths = paths[:]
use_stub = job["attributes"].get('stub-installer')
if not use_stub:
no_stub = ("mozilla-esr60", "jamun")
if project in no_stub:
# Stub installer is only generated on win32 and not on esr
# XXX We really should have a better solution for this
if 'target.stub-installer.exe' in usable_paths:
usable_paths.remove('target.stub-installer.exe')
upstream_artifacts.append({

19
taskcluster/taskgraph/transforms/build.py
View File

@ -9,7 +9,6 @@ kind.
from __future__ import absolute_import, print_function, unicode_literals
from taskgraph.transforms.base import TransformSequence
from taskgraph.util.schema import resolve_keyed_by
from taskgraph.util.workertypes import worker_type_implementation
transforms = TransformSequence()
@ -33,26 +32,12 @@ def set_defaults(config, jobs):
yield job
@transforms.add
def stub_installer(config, jobs):
for job in jobs:
job.setdefault('attributes', {})
if job.get('stub-installer'):
resolve_keyed_by(
job, 'stub-installer', item_name=job['name'], project=config.params['project']
)
job['attributes']['stub-installer'] = job['stub-installer']
del job['stub-installer']
job['worker']['env'].update({"USE_STUB_INSTALLER": "1"})
yield job
@transforms.add
def set_env(config, jobs):
"""Set extra environment variables from try command line."""
env = []
env = {}
if config.params['try_mode'] == 'try_option_syntax':
env = config.params['try_options']['env'] or []
env = config.params['try_options']['env'] or {}
for job in jobs:
if env:
job['worker']['env'].update(dict(x.split('=') for x in env))

1
taskcluster/taskgraph/transforms/build_signing.py
View File

@ -46,6 +46,7 @@ def define_upstream_artifacts(config, jobs):
dep_job,
keep_locale_template=False,
kind=config.kind,
project=config.params["project"],
)
if 'android' in build_platform:

47
taskcluster/taskgraph/transforms/l10n.py
View File

@ -20,7 +20,6 @@ from taskgraph.util.schema import (
resolve_keyed_by,
Schema,
)
from taskgraph.util.attributes import copy_attributes_from_dependent_job
from taskgraph.util.taskcluster import get_artifact_prefix
from taskgraph.util.treeherder import add_suffix
from taskgraph.transforms.job import job_description_schema
@ -198,10 +197,18 @@ def _remove_locales(locales, to_remove=None):
def setup_name(config, jobs):
for job in jobs:
dep = job['dependent-task']
# Set the name to the same as the dep task, without kind name.
# Label will get set automatically with this kinds name.
job['name'] = job.get('name',
dep.task['metadata']['name'][len(dep.kind) + 1:])
if dep.attributes.get('nightly'):
# Set the name to the same as the dep task, without kind name.
# Label will get set automatically with this kinds name.
job['name'] = job.get('name',
dep.task['metadata']['name'][
len(dep.kind) + 1:])
else:
# Set to match legacy use at the moment (to support documented try
# syntax). Set the name to same as dep task + '-l10n' but without the
# kind name attached, since that gets added when label is generated
name, jobtype = dep.task['metadata']['name'][len(dep.kind) + 1:].split('/')
job['name'] = "{}-l10n/{}".format(name, jobtype)
yield job
@ -209,11 +216,20 @@ def setup_name(config, jobs):
def copy_in_useful_magic(config, jobs):
for job in jobs:
dep = job['dependent-task']
attributes = copy_attributes_from_dependent_job(dep)
attributes.update(job.get('attributes', {}))
attributes = job.setdefault('attributes', {})
# build-platform is needed on `job` for by-build-platform
job['build-platform'] = attributes.get("build_platform")
job['attributes'] = attributes
job['build-platform'] = dep.attributes.get("build_platform")
attributes['build_type'] = dep.attributes.get("build_type")
if dep.attributes.get('artifact_prefix'):
attributes['artifact_prefix'] = dep.attributes['artifact_prefix']
if dep.attributes.get("nightly"):
attributes['nightly'] = dep.attributes.get("nightly")
else:
# set build_platform to have l10n as well, to match older l10n setup
# for now
job['build-platform'] = "{}-l10n".format(job['build-platform'])
attributes['build_platform'] = job['build-platform']
yield job
@ -229,6 +245,9 @@ def validate_early(config, jobs):
def setup_nightly_dependency(config, jobs):
""" Sets up a task dependency to the signing job this relates to """
for job in jobs:
if not job['attributes'].get('nightly'):
yield job
continue # do not add a dep unless we're a nightly
job['dependencies'] = {'unsigned-build': job['dependent-task'].label}
if job['attributes']['build_platform'].startswith('win') or \
job['attributes']['build_platform'].startswith('linux'):
@ -387,16 +406,6 @@ def validate_again(config, jobs):
yield job
@transforms.add
def stub_installer(config, jobs):
for job in jobs:
job.setdefault('attributes', {})
job.setdefault('env', {})
if job["attributes"].get('stub-installer'):
job['env'].update({"USE_STUB_INSTALLER": "1"})
yield job
@transforms.add
def make_job_description(config, jobs):
for job in jobs:

1
taskcluster/taskgraph/transforms/nightly_l10n_signing.py
View File

@ -40,6 +40,7 @@ def define_upstream_artifacts(config, jobs):
locale_specifications = generate_specifications_of_artifacts_to_sign(
dep_job,
keep_locale_template=True,
project=config.params["project"],
)
upstream_artifacts = []

29
taskcluster/taskgraph/transforms/repackage.py
View File

@ -138,13 +138,8 @@ def make_job_description(config, jobs):
# have better beetmover support.
dependencies.update(signing_dependencies)
attributes = copy_attributes_from_dependent_job(dep_job)
treeherder = job.get('treeherder', {})
if attributes.get('nightly'):
treeherder.setdefault('symbol', 'Nr')
else:
treeherder.setdefault('symbol', 'Rpk')
treeherder.setdefault('symbol', 'Nr')
dep_th_platform = dep_job.task.get('extra', {}).get(
'treeherder', {}).get('machine', {}).get('platform', '')
treeherder.setdefault('platform', "{}/opt".format(dep_th_platform))
@ -272,15 +267,16 @@ def _generate_task_env(task, build_platform, build_task_ref, signing_task_ref, l
'UNSIGNED_MAR': {'task-reference': '{}mar.exe'.format(mar_prefix)},
}
use_stub = task.attributes.get('stub-installer')
if use_stub:
task_env['SIGNED_SETUP_STUB'] = {
'task-reference': '{}setup-stub.exe'.format(signed_prefix),
}
elif '32' in build_platform:
# Stub installer is only attempted on win32
no_stub = ("mozilla-esr60", "jamun")
if project in no_stub:
# Stub installer is only generated on win32 and not on esr
task_env['NO_STUB_INSTALLER'] = '1'
else:
# Stub installer is only generated on win32
if '32' in build_platform:
task_env['SIGNED_SETUP_STUB'] = {
'task-reference': '{}setup-stub.exe'.format(signed_prefix),
}
return task_env
raise NotImplementedError('Unsupported build_platform: "{}"'.format(build_platform))
@ -317,8 +313,9 @@ def _generate_task_output_files(task, build_platform, locale=None, project=None)
'name': '{}/{}target.complete.mar'.format(artifact_prefix, locale_output_path),
}]
use_stub = task.attributes.get('stub-installer')
if use_stub:
# Stub installer is only generated on win32 and not on esr
no_stub = ("mozilla-esr60", "jamun")
if 'win32' in build_platform and project not in no_stub:
output_files.append({
'type': 'file',
'path': '{}/{}target.stub-installer.exe'.format(

45
taskcluster/taskgraph/transforms/repackage_signing.py
View File

@ -49,14 +49,10 @@ def validate(config, jobs):
def make_repackage_signing_description(config, jobs):
for job in jobs:
dep_job = job['dependent-task']
attributes = copy_attributes_from_dependent_job(dep_job)
attributes['repackage_type'] = 'repackage-signing'
attributes = dep_job.attributes
treeherder = job.get('treeherder', {})
if attributes.get('nightly'):
treeherder.setdefault('symbol', 'rs(N)')
else:
treeherder.setdefault('symbol', 'rs(B)')
treeherder.setdefault('symbol', 'rs(N)')
dep_th_platform = dep_job.task.get('extra', {}).get(
'treeherder', {}).get('machine', {}).get('platform', '')
treeherder.setdefault('platform',
@ -65,21 +61,6 @@ def make_repackage_signing_description(config, jobs):
treeherder.setdefault('kind', 'build')
label = job['label']
dependencies = {"repackage": dep_job.label}
signing_dependencies = dep_job.dependencies
# This is so we get the build task etc in our dependencies to
# have better beetmover support.
dependencies.update({k: v for k, v in signing_dependencies.items()
if k != 'docker-image'})
locale_str = ""
if dep_job.attributes.get('locale'):
treeherder['symbol'] = 'rs({})'.format(dep_job.attributes.get('locale'))
attributes['locale'] = dep_job.attributes.get('locale')
locale_str = "{}/".format(dep_job.attributes.get('locale'))
description = (
"Signing of repackaged artifacts for locale '{locale}' for build '"
"{build_platform}/{build_type}'".format(
@ -89,6 +70,22 @@ def make_repackage_signing_description(config, jobs):
)
)
dependencies = {"repackage": dep_job.label}
signing_dependencies = dep_job.dependencies
# This is so we get the build task etc in our dependencies to
# have better beetmover support.
dependencies.update({k: v for k, v in signing_dependencies.items()
if k != 'docker-image'})
attributes = copy_attributes_from_dependent_job(dep_job)
attributes['repackage_type'] = 'repackage-signing'
locale_str = ""
if dep_job.attributes.get('locale'):
treeherder['symbol'] = 'rs({})'.format(dep_job.attributes.get('locale'))
attributes['locale'] = dep_job.attributes.get('locale')
locale_str = "{}/".format(dep_job.attributes.get('locale'))
build_platform = dep_job.attributes.get('build_platform')
is_nightly = dep_job.attributes.get('nightly')
signing_cert_scope = get_signing_cert_scope_per_platform(
@ -115,8 +112,10 @@ def make_repackage_signing_description(config, jobs):
})
scopes.append(add_scope_prefix(config, "signing:format:sha2signcode"))
use_stub = attributes.get('stub-installer')
if use_stub:
# Stub installer is only generated on win32 and not on esr
no_stub = ("mozilla-esr60", "jamun")
if 'win32' in build_platform and not config.params["project"] in no_stub:
# TODO: fix the project hint to be a better design
upstream_artifacts.append({
"taskId": {"task-reference": "<repackage>"},
"taskType": "repackage",

5
taskcluster/taskgraph/transforms/task.py
View File

@ -591,7 +591,6 @@ V2_NIGHTLY_L10N_TEMPLATES = [
V2_L10N_TEMPLATES = [
"index.{trust-domain}.v2.{project}.revision.{branch_rev}.{product}-l10n.{job-name}.{locale}",
"index.{trust-domain}.v2.{project}.pushdate.{build_date_long}.{product}-l10n.{job-name}.{locale}", # noqa - too long
"index.{trust-domain}.v2.{project}.pushlog-id.{pushlog_id}.{product}-l10n.{job-name}.{locale}",
"index.{trust-domain}.v2.{project}.latest.{product}-l10n.{job-name}.{locale}",
]
@ -1413,8 +1412,6 @@ def add_nightly_l10n_index_routes(config, task, force_locale=None):
subs['job-name'] = index['job-name']
subs['build_date_long'] = time.strftime("%Y.%m.%d.%Y%m%d%H%M%S",
time.gmtime(config.params['build_date']))
subs['build_date'] = time.strftime("%Y.%m.%d",
time.gmtime(config.params['build_date']))
subs['product'] = index['product']
subs['trust-domain'] = config.graph_config['trust-domain']
subs['branch_rev'] = get_branch_rev(config)
@ -1436,6 +1433,8 @@ def add_nightly_l10n_index_routes(config, task, force_locale=None):
for tpl in V2_NIGHTLY_L10N_TEMPLATES:
routes.append(tpl.format(locale=locale, **subs))
# Add locales at old route too
task = add_l10n_index_routes(config, task, force_locale=force_locale)
return task

1
taskcluster/taskgraph/util/attributes.py
View File

@ -37,7 +37,6 @@ _OPTIONAL_ATTRIBUTES = (
'signed',
'shipping_phase',
'shipping_product',
'stub-installer',
)

10
taskcluster/taskgraph/util/signed_artifacts.py
View File

@ -15,10 +15,10 @@ def is_partner_kind(kind):
def generate_specifications_of_artifacts_to_sign(
task, keep_locale_template=True, kind=None
task, keep_locale_template=True, kind=None, project=None
):
build_platform = task.attributes.get('build_platform')
use_stub = task.attributes.get('stub-installer')
is_nightly = task.attributes.get('nightly')
if kind == 'release-source-signing':
artifacts_specifications = [{
'artifacts': [
@ -56,8 +56,10 @@ def generate_specifications_of_artifacts_to_sign(
],
'formats': ['sha2signcode', 'widevine'],
}]
if use_stub:
no_stub = ("mozilla-esr60", "jamun")
if 'win32' in build_platform and is_nightly and project not in no_stub:
# TODO: fix the project hint to be a better design
# We don't build stub installer on esr, so we don't want to sign it
artifacts_specifications[0]['artifacts'] += [
get_artifact_path(task, '{locale}/setup-stub.exe')
]

3
testing/mozharness/configs/single_locale/onchange.py
View File

@ -1,3 +0,0 @@
config = {
"update_channel": "default",
}

2
testing/mozharness/configs/single_locale/try.py
View File

@ -4,7 +4,7 @@ config = {
"nightly_build": False,
"branch": "try",
"en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central",
"update_channel": "nightly-try",
"update_channel": "nightly",
# l10n
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",