Bug 1520010: Remove signing format scopes r=aki

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Chris AtLee 2019-06-10 16:13:36 +00:00
Родитель 267b1784b4
Коммит 2715af0c6a
6 изменённых файлов: 1 добавлений и 28 удалений

Просмотреть файл

@ -11,7 +11,6 @@ from taskgraph.loader.single_dep import schema
from taskgraph.transforms.base import TransformSequence
from taskgraph.util.attributes import copy_attributes_from_dependent_job
from taskgraph.util.scriptworker import (
add_scope_prefix,
get_signing_cert_scope_per_platform,
get_worker_type_for_scope,
)
@ -66,11 +65,6 @@ def make_repackage_signing_description(config, jobs):
upstream_artifacts = _craft_upstream_artifacts(dep_job.kind, build_platform)
scopes = [signing_cert_scope]
scopes += list({
add_scope_prefix(config, 'signing:format:{}'.format(format))
for artifact in upstream_artifacts
for format in artifact['formats']
})
task = {
'label': job['label'],

Просмотреть файл

@ -11,7 +11,6 @@ import os
from taskgraph.transforms.base import TransformSequence
from taskgraph.util.attributes import copy_attributes_from_dependent_job, sorted_unique_list
from taskgraph.util.scriptworker import (
add_scope_prefix,
get_signing_cert_scope_per_platform,
get_worker_type_for_scope,
)
@ -144,11 +143,7 @@ def make_task_description(config, jobs):
build_platform, is_nightly, config
)
scopes = [signing_cert_scope] + list({
add_scope_prefix(config, 'signing:format:{}'.format(format))
for artifact in upstream_artifacts
for format in artifact['formats']
})
scopes = [signing_cert_scope]
task = {
'label': label,

Просмотреть файл

@ -11,7 +11,6 @@ from taskgraph.loader.single_dep import schema
from taskgraph.transforms.base import TransformSequence
from taskgraph.util.attributes import copy_attributes_from_dependent_job
from taskgraph.util.scriptworker import (
add_scope_prefix,
get_signing_cert_scope_per_platform,
get_worker_type_for_scope,
)
@ -61,7 +60,6 @@ def make_signing_description(config, jobs):
if 'win' in build_platform:
# job['primary-dependency'].task['payload']['command']
scopes.append(add_scope_prefix(config, "signing:format:sha2signcode"))
formats = ['sha2signcode']
else:
formats = ['autograph_gpg']

Просмотреть файл

@ -13,7 +13,6 @@ from taskgraph.loader.single_dep import schema
from taskgraph.transforms.base import TransformSequence
from taskgraph.util.attributes import copy_attributes_from_dependent_job
from taskgraph.util.scriptworker import (
add_scope_prefix,
get_signing_cert_scope_per_platform,
get_worker_type_for_scope,
)
@ -106,12 +105,6 @@ def make_repackage_signing_description(config, jobs):
"formats": SIGNING_FORMATS[os.path.basename(artifact)],
})
scopes += list({
add_scope_prefix(config, 'signing:format:{}'.format(format))
for artifact in upstream_artifacts
for format in artifact['formats']
})
task = {
'label': label,
'description': description,

Просмотреть файл

@ -12,7 +12,6 @@ from taskgraph.transforms.base import TransformSequence
from taskgraph.util.attributes import copy_attributes_from_dependent_job
from taskgraph.util.partners import check_if_partners_enabled
from taskgraph.util.scriptworker import (
add_scope_prefix,
get_signing_cert_scope_per_platform,
get_worker_type_for_scope,
)
@ -83,7 +82,6 @@ def make_repackage_signing_description(config, jobs):
],
"formats": ["sha2signcode", "autograph_gpg"]
}]
scopes.append(add_scope_prefix(config, "signing:format:sha2signcode"))
elif 'mac' in build_platform:
upstream_artifacts = [{
"taskId": {"task-reference": "<repackage>"},

Просмотреть файл

@ -12,7 +12,6 @@ from taskgraph.transforms.base import TransformSequence
from taskgraph.util.attributes import copy_attributes_from_dependent_job
from taskgraph.util.schema import taskref_or_string
from taskgraph.util.scriptworker import (
add_scope_prefix,
get_signing_cert_scope_per_platform,
get_worker_type_for_scope,
)
@ -83,10 +82,6 @@ def make_task_description(config, jobs):
for artifacts in job['upstream-artifacts']:
for f in artifacts['formats']:
formats.add(f) # Add each format only once
for format in formats:
signing_format_scopes.append(
add_scope_prefix(config, 'signing:format:{}'.format(format))
)
is_nightly = dep_job.attributes.get(
'nightly', dep_job.attributes.get('shippable', False))