Unverified Commit 34153a0e authored by Johan Lorenzo's avatar Johan Lorenzo Committed by GitHub
Browse files

Bug 1580778 - Fix signing scopes and indexes (#5426)

parent 2879fa56
......@@ -5,6 +5,7 @@ treeherder:
'forPerformanceTest': 'Builds made for Raptor and other performance tests'
'I': 'Docker Image Builds'
'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'
'production': 'Release-related tasks'
'Rap': 'Raptor tests'
......
......@@ -8,7 +8,7 @@ transforms:
kind-dependencies:
- signing
only-for-build-types:
- raptor
- performance-test
only-for-abis:
- armeabi-v7a
- arm64-v8a
......
......@@ -13,8 +13,6 @@ kind-dependencies:
job-defaults:
description: Sign Fenix
index:
type: signing
worker-type:
by-variant:
(nightly|nightly-legacy|production):
......@@ -22,14 +20,6 @@ job-defaults:
'3': 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: []
treeherder:
kind: build
......@@ -40,7 +30,10 @@ jobs:
performance-test:
attributes:
build-type: performance-test
worker-type: dep-signing
index:
type: signing
worker:
signing-type: dep-signing
dependencies:
build: 'assemble: geckoNightlyForPerformanceTest' # comes from the old-decision task
treeherder:
......@@ -49,16 +42,46 @@ jobs:
production:
attributes:
build-type: production
index:
type: signing
worker:
signing-type:
by-level:
'3': production-signing
default: dep-signing
dependencies:
build: 'Build FenixProduction task' # comes from the old-decision task
run-on-tasks-for: [github-release]
treeherder:
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:
attributes:
build-type: nightly
nightly: true
index:
type: signing
worker:
signing-type:
by-level:
'3': nightly-signing
default: dep-signing
dependencies:
build: 'Build FenixNightly task' # comes from the old-decision task
treeherder:
......@@ -68,6 +91,11 @@ jobs:
attributes:
build-type: nightly-legacy
nightly: true
worker:
signing-type:
by-level:
'3': production-signing
default: dep-signing
dependencies:
build: 'Build FenixNightlyLegacy task' # comes from the old-decision task
treeherder:
......
......@@ -28,11 +28,14 @@ def fetch_old_decision_dependency(config, tasks):
@transforms.add
def define_signing_flags(config, tasks):
def define_signing_attributes(config, tasks):
for task in tasks:
dep = task["primary-dependency"]
# Current kind will be prepended later in the transform chain.
task.setdefault("attributes", {}).update(dep.attributes.copy())
attributes = task.setdefault("attributes", {})
upstream_attributes = dep.attributes.copy()
upstream_attributes.update(attributes)
task["attributes"] = upstream_attributes
task["attributes"]["signed"] = True
if "run_on_tasks_for" in task["attributes"]:
task["run-on-tasks-for"] = task["attributes"]["run_on_tasks_for"]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment