Bug 1490094: [release] Use release_type to configure balrog tasks; r=bhearsum

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Tom Prince 2018-09-17 18:09:36 +00:00
parent 52b5c21a1c
commit 14af86569e
5 changed files with 56 additions and 109 deletions

View File

@ -28,14 +28,19 @@ jobs:
worker:
product: firefox
publish-rules:
by-project:
maple: [32]
birch: [145]
jamun: [724]
mozilla-beta: [32]
mozilla-release: [145]
mozilla-esr60: [806]
default: []
by-release-level:
production:
by-release-type:
beta: [32]
release: [145]
esr60: [806]
default: []
staging:
by-release-type:
beta: [32]
release: [145]
esr60: [724]
default: []
treeherder:
platform: firefox-release/opt
symbol: Rel(BSFx)
@ -48,10 +53,7 @@ jobs:
run-on-releases: [esr60]
worker:
product: firefox
publish-rules:
by-project:
mozilla-esr60: [521]
default: []
publish-rules: [521]
blob-suffix: -bz2
treeherder:
platform: firefox-release/opt
@ -64,11 +66,7 @@ jobs:
shipping-product: devedition
worker:
product: devedition
publish-rules:
by-project:
maple: [10]
mozilla-beta: [10]
default: []
publish-rules: [10]
treeherder:
platform: devedition-release/opt
symbol: Rel(BSDev)

View File

@ -34,31 +34,30 @@ jobs:
worker:
product: firefox
channel-names:
by-project:
maple: ["beta", "beta-localtest", "beta-cdntest"]
birch: ["release", "release-localtest", "release-cdntest"]
jamun: ["esr", "esr-localtest", "esr-cdntest"]
mozilla-beta: ["beta", "beta-localtest", "beta-cdntest"]
mozilla-release: ["release", "release-localtest", "release-cdntest"]
mozilla-esr60: ["esr", "esr-localtest", "esr-cdntest"]
by-release-type:
beta: ["beta", "beta-localtest", "beta-cdntest"]
release(-rc)?: ["release", "release-localtest", "release-cdntest"]
esr60: ["esr", "esr-localtest", "esr-cdntest"]
default: []
publish-rules:
by-project:
maple: [32]
birch: [145]
jamun: [724]
mozilla-beta: [32]
mozilla-release: [145]
mozilla-esr60: [806]
default: []
by-release-level:
production:
by-release-type:
beta: [32]
release(-rc)?: [145]
esr60: [806]
default: []
staging:
by-release-type:
beta: [32]
release(-rc)?: [145]
esr60: [724]
default: []
rules-to-update:
by-project:
maple: ["firefox-beta-cdntest", "firefox-beta-localtest"]
birch: ["firefox-release-cdntest", "firefox-release-localtest"]
jamun: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
mozilla-beta: ["firefox-beta-cdntest", "firefox-beta-localtest"]
mozilla-release: ["firefox-release-cdntest", "firefox-release-localtest"]
mozilla-esr60: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
by-release-type:
beta: ["firefox-beta-cdntest", "firefox-beta-localtest"]
release(-rc)?: ["firefox-release-cdntest", "firefox-release-localtest"]
esr60: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
default: []
platforms: ["linux", "linux64", "macosx64", "win32", "win64"]
treeherder:
@ -74,18 +73,12 @@ jobs:
run-on-releases: [esr60]
worker:
product: firefox
channel-names:
by-project:
mozilla-esr60: ["esr", "esr-localtest", "esr-cdntest"]
default: []
channel-names: ["esr", "esr-localtest", "esr-cdntest"]
publish-rules:
by-project:
mozilla-esr60: [521]
default: []
rules-to-update:
by-project:
mozilla-esr60: ["esr52-cdntest", "esr52-localtest"]
default: []
by-release-level:
production: [521]
staging: [521]
rules-to-update: ["esr52-cdntest", "esr52-localtest"]
platforms: ["linux", "linux64", "macosx64", "win32", "win64"]
blob-suffix: -bz2
complete-mar-filename-pattern: '%s-%s.bz2.complete.mar'
@ -100,23 +93,12 @@ jobs:
name: submit-toplevel-devedition-release-to-balrog
description: submit toplevel Devedition release to balrog
shipping-product: devedition
run-on-releases: [beta]
worker:
product: devedition
channel-names:
by-project:
maple: ["aurora", "aurora-localtest", "aurora-cdntest"]
mozilla-beta: ["aurora", "aurora-localtest", "aurora-cdntest"]
default: []
publish-rules:
by-project:
maple: [10]
mozilla-beta: [10]
default: []
rules-to-update:
by-project:
maple: ["devedition-cdntest", "devedition-localtest"]
mozilla-beta: ["devedition-cdntest", "devedition-localtest"]
default: []
channel-names: ["aurora", "aurora-localtest", "aurora-cdntest"]
publish-rules: [10]
rules-to-update: ["devedition-cdntest", "devedition-localtest"]
platforms: ["linux", "linux64", "macosx64", "win32", "win64"]
treeherder:
platform: devedition-release/opt

View File

@ -29,25 +29,9 @@ jobs:
worker:
product: firefox
release-eta: ''
channel-names:
by-project:
birch: ["beta", "beta-localtest", "beta-cdntest"]
jamun: ["esr", "esr-localtest", "esr-cdntest"]
mozilla-release: ["beta", "beta-localtest", "beta-cdntest"]
mozilla-esr60: ["esr", "esr-localtest", "esr-cdntest"]
default: []
publish-rules:
by-project:
birch: [32]
mozilla-release: [32]
default: []
rules-to-update:
by-project:
birch: ["firefox-beta-cdntest", "firefox-beta-localtest"]
jamun: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
mozilla-release: ["firefox-beta-cdntest", "firefox-beta-localtest"]
mozilla-esr60: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
default: []
channel-names: ["beta", "beta-localtest", "beta-cdntest"]
publish-rules: [32]
rules-to-update: ["firefox-beta-cdntest", "firefox-beta-localtest"]
treeherder:
platform: linux64/opt
symbol: Rel(BSFxRC)

View File

@ -33,27 +33,9 @@ jobs:
shipping-product: firefox
worker:
product: firefox
channel-names:
by-project:
birch: ["beta", "beta-localtest", "beta-cdntest"]
jamun: ["esr", "esr-localtest", "esr-cdntest"]
mozilla-release: ["beta", "beta-localtest", "beta-cdntest"]
mozilla-esr60: ["esr", "esr-localtest", "esr-cdntest"]
default: []
publish-rules:
by-project:
birch: [32]
jamun: [724]
mozilla-release: [32]
mozilla-esr60: []
default: []
rules-to-update:
by-project:
birch: ["firefox-beta-cdntest", "firefox-beta-localtest"]
jamun: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
mozilla-release: ["firefox-beta-cdntest", "firefox-beta-localtest"]
mozilla-esr60: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
default: []
channel-names: ["beta", "beta-localtest", "beta-cdntest"]
publish-rules: [32]
rules-to-update: ["firefox-beta-cdntest", "firefox-beta-localtest"]
treeherder:
platform: linux64/opt
symbol: Rel(BPFxRC)

View File

@ -543,10 +543,11 @@ task_description_schema = Schema({
Optional('product'): basestring,
Optional('platforms'): [basestring],
Optional('release-eta'): basestring,
Optional('channel-names'): optionally_keyed_by('project', [basestring]),
Optional('channel-names'): optionally_keyed_by('release-type', [basestring]),
Optional('require-mirrors'): bool,
Optional('publish-rules'): optionally_keyed_by('project', [int]),
Optional('rules-to-update'): optionally_keyed_by('project', [basestring]),
Optional('publish-rules'): optionally_keyed_by('release-type', 'release-level', [int]),
Optional('rules-to-update'): optionally_keyed_by(
'release-type', 'release-level', [basestring]),
Optional('archive-domain'): optionally_keyed_by('release-level', basestring),
Optional('download-domain'): optionally_keyed_by('release-level', basestring),
Optional('blob-suffix'): basestring,
@ -1159,7 +1160,7 @@ def build_balrog_payload(config, task, task_def):
resolve_keyed_by(
worker, prop, task['description'],
**{
'project': config.params['project'],
'release-type': config.params['release_type'],
'release-level': config.params.release_level(),
}
)