Bug 1580778 - Fix signing scopes and indexes (#5426)
parent
2879fa5660
commit
34153a0e7a
|
@ -5,6 +5,7 @@ treeherder:
|
||||||
'forPerformanceTest': 'Builds made for Raptor and other performance tests'
|
'forPerformanceTest': 'Builds made for Raptor and other performance tests'
|
||||||
'I': 'Docker Image Builds'
|
'I': 'Docker Image Builds'
|
||||||
'nightly': 'Nightly-related tasks'
|
'nightly': 'Nightly-related tasks'
|
||||||
|
'nightlyFennec': 'Nightly-related tasks with same APK configuration as Fennec'
|
||||||
'nightlyLegacy': 'Nightly-related tasks that ship to https://play.google.com/store/apps/details?id=org.mozilla.fenix'
|
'nightlyLegacy': 'Nightly-related tasks that ship to https://play.google.com/store/apps/details?id=org.mozilla.fenix'
|
||||||
'production': 'Release-related tasks'
|
'production': 'Release-related tasks'
|
||||||
'Rap': 'Raptor tests'
|
'Rap': 'Raptor tests'
|
||||||
|
|
|
@ -8,7 +8,7 @@ transforms:
|
||||||
kind-dependencies:
|
kind-dependencies:
|
||||||
- signing
|
- signing
|
||||||
only-for-build-types:
|
only-for-build-types:
|
||||||
- raptor
|
- performance-test
|
||||||
only-for-abis:
|
only-for-abis:
|
||||||
- armeabi-v7a
|
- armeabi-v7a
|
||||||
- arm64-v8a
|
- arm64-v8a
|
||||||
|
|
|
@ -13,8 +13,6 @@ kind-dependencies:
|
||||||
|
|
||||||
job-defaults:
|
job-defaults:
|
||||||
description: Sign Fenix
|
description: Sign Fenix
|
||||||
index:
|
|
||||||
type: signing
|
|
||||||
worker-type:
|
worker-type:
|
||||||
by-variant:
|
by-variant:
|
||||||
(nightly|nightly-legacy|production):
|
(nightly|nightly-legacy|production):
|
||||||
|
@ -22,14 +20,6 @@ job-defaults:
|
||||||
'3': signing
|
'3': signing
|
||||||
default: dep-signing
|
default: dep-signing
|
||||||
default: dep-signing
|
default: dep-signing
|
||||||
worker:
|
|
||||||
signing-type:
|
|
||||||
by-variant:
|
|
||||||
(nightly|nightly-legacy|production):
|
|
||||||
by-level:
|
|
||||||
'3': release-signing
|
|
||||||
default: dep-signing
|
|
||||||
default: dep-signing
|
|
||||||
run-on-tasks-for: []
|
run-on-tasks-for: []
|
||||||
treeherder:
|
treeherder:
|
||||||
kind: build
|
kind: build
|
||||||
|
@ -40,7 +30,10 @@ jobs:
|
||||||
performance-test:
|
performance-test:
|
||||||
attributes:
|
attributes:
|
||||||
build-type: performance-test
|
build-type: performance-test
|
||||||
worker-type: dep-signing
|
index:
|
||||||
|
type: signing
|
||||||
|
worker:
|
||||||
|
signing-type: dep-signing
|
||||||
dependencies:
|
dependencies:
|
||||||
build: 'assemble: geckoNightlyForPerformanceTest' # comes from the old-decision task
|
build: 'assemble: geckoNightlyForPerformanceTest' # comes from the old-decision task
|
||||||
treeherder:
|
treeherder:
|
||||||
|
@ -49,16 +42,46 @@ jobs:
|
||||||
production:
|
production:
|
||||||
attributes:
|
attributes:
|
||||||
build-type: production
|
build-type: production
|
||||||
|
index:
|
||||||
|
type: signing
|
||||||
|
worker:
|
||||||
|
signing-type:
|
||||||
|
by-level:
|
||||||
|
'3': production-signing
|
||||||
|
default: dep-signing
|
||||||
dependencies:
|
dependencies:
|
||||||
build: 'Build FenixProduction task' # comes from the old-decision task
|
build: 'Build FenixProduction task' # comes from the old-decision task
|
||||||
run-on-tasks-for: [github-release]
|
run-on-tasks-for: [github-release]
|
||||||
treeherder:
|
treeherder:
|
||||||
symbol: production(s)
|
symbol: production(s)
|
||||||
|
|
||||||
|
fennec-production:
|
||||||
|
attributes:
|
||||||
|
build-type: fennec-production
|
||||||
|
nightly: true
|
||||||
|
index:
|
||||||
|
type: signing
|
||||||
|
worker:
|
||||||
|
signing-type:
|
||||||
|
by-level:
|
||||||
|
'3': fennec-production-signing
|
||||||
|
default: dep-signing
|
||||||
|
dependencies:
|
||||||
|
build: 'Build FennecProduction task' # comes from the old-decision task
|
||||||
|
treeherder:
|
||||||
|
symbol: nightlyFennec(s)
|
||||||
|
|
||||||
nightly:
|
nightly:
|
||||||
attributes:
|
attributes:
|
||||||
build-type: nightly
|
build-type: nightly
|
||||||
nightly: true
|
nightly: true
|
||||||
|
index:
|
||||||
|
type: signing
|
||||||
|
worker:
|
||||||
|
signing-type:
|
||||||
|
by-level:
|
||||||
|
'3': nightly-signing
|
||||||
|
default: dep-signing
|
||||||
dependencies:
|
dependencies:
|
||||||
build: 'Build FenixNightly task' # comes from the old-decision task
|
build: 'Build FenixNightly task' # comes from the old-decision task
|
||||||
treeherder:
|
treeherder:
|
||||||
|
@ -68,6 +91,11 @@ jobs:
|
||||||
attributes:
|
attributes:
|
||||||
build-type: nightly-legacy
|
build-type: nightly-legacy
|
||||||
nightly: true
|
nightly: true
|
||||||
|
worker:
|
||||||
|
signing-type:
|
||||||
|
by-level:
|
||||||
|
'3': production-signing
|
||||||
|
default: dep-signing
|
||||||
dependencies:
|
dependencies:
|
||||||
build: 'Build FenixNightlyLegacy task' # comes from the old-decision task
|
build: 'Build FenixNightlyLegacy task' # comes from the old-decision task
|
||||||
treeherder:
|
treeherder:
|
||||||
|
|
|
@ -28,11 +28,14 @@ def fetch_old_decision_dependency(config, tasks):
|
||||||
|
|
||||||
|
|
||||||
@transforms.add
|
@transforms.add
|
||||||
def define_signing_flags(config, tasks):
|
def define_signing_attributes(config, tasks):
|
||||||
for task in tasks:
|
for task in tasks:
|
||||||
dep = task["primary-dependency"]
|
dep = task["primary-dependency"]
|
||||||
# Current kind will be prepended later in the transform chain.
|
attributes = task.setdefault("attributes", {})
|
||||||
task.setdefault("attributes", {}).update(dep.attributes.copy())
|
upstream_attributes = dep.attributes.copy()
|
||||||
|
upstream_attributes.update(attributes)
|
||||||
|
task["attributes"] = upstream_attributes
|
||||||
|
|
||||||
task["attributes"]["signed"] = True
|
task["attributes"]["signed"] = True
|
||||||
if "run_on_tasks_for" in task["attributes"]:
|
if "run_on_tasks_for" in task["attributes"]:
|
||||||
task["run-on-tasks-for"] = task["attributes"]["run_on_tasks_for"]
|
task["run-on-tasks-for"] = task["attributes"]["run_on_tasks_for"]
|
||||||
|
|
Loading…
Reference in New Issue