Bug 1732929 - use release_type parameter in release-bouncer-aliases task config r=bhearsum DONTBUILD

Differential Revision: https://phabricator.services.mozilla.com/D172261
This commit is contained in:
Julien Cristau 2023-03-16 14:07:08 +00:00
Родитель 025982b671
Коммит d2ed6328b6
2 изменённых файлов: 10 добавлений и 21 удалений

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

@ -46,8 +46,8 @@ jobs:
firefox: firefox:
bouncer-products-per-alias: bouncer-products-per-alias:
by-project: by-release-type:
mozilla-beta: beta:
firefox-beta-latest-ssl: installer-ssl firefox-beta-latest-ssl: installer-ssl
firefox-beta-latest: installer firefox-beta-latest: installer
firefox-beta-stub: stub-installer firefox-beta-stub: stub-installer
@ -55,7 +55,7 @@ jobs:
firefox-beta-msix-latest-ssl: msix firefox-beta-msix-latest-ssl: msix
firefox-beta-pkg-latest-ssl: pkg firefox-beta-pkg-latest-ssl: pkg
firefox-beta-langpack-latest-ssl: langpack firefox-beta-langpack-latest-ssl: langpack
mozilla-release: release.*:
firefox-latest-ssl: installer-ssl firefox-latest-ssl: installer-ssl
firefox-latest: installer firefox-latest: installer
firefox-stub: stub-installer firefox-stub: stub-installer
@ -63,7 +63,7 @@ jobs:
firefox-msix-latest-ssl: msix firefox-msix-latest-ssl: msix
firefox-pkg-latest-ssl: pkg firefox-pkg-latest-ssl: pkg
firefox-langpack-latest-ssl: langpack firefox-langpack-latest-ssl: langpack
mozilla-esr102: esr102:
# when there is one ESR branch both sets of aliases work # when there is one ESR branch both sets of aliases work
# when there are two ESR branches ... # when there are two ESR branches ...
# ... these always point to the older branch # ... these always point to the older branch
@ -73,7 +73,7 @@ jobs:
firefox-esr-msix-latest-ssl: msix firefox-esr-msix-latest-ssl: msix
firefox-esr-pkg-latest-ssl: pkg firefox-esr-pkg-latest-ssl: pkg
firefox-esr-langpack-latest-ssl: langpack firefox-esr-langpack-latest-ssl: langpack
mozilla-esrXXX: # XXX - to update when we branch next ESR esrXXX: # XXX - to update when we branch next ESR
# ... these point to the newer branch # ... these point to the newer branch
firefox-esr-next-latest-ssl: installer-ssl firefox-esr-next-latest-ssl: installer-ssl
firefox-esr-next-latest: installer firefox-esr-next-latest: installer
@ -81,24 +81,13 @@ jobs:
firefox-esr-next-msix-latest-ssl: msix firefox-esr-next-msix-latest-ssl: msix
firefox-esr-next-pkg-latest-ssl: pkg firefox-esr-next-pkg-latest-ssl: pkg
firefox-esr-next-langpack-latest-ssl: langpack firefox-esr-next-langpack-latest-ssl: langpack
birch:
firefox-latest-ssl: installer-ssl
firefox-latest: installer
firefox-stub: stub-installer
jamun:
firefox-esr-latest-ssl: installer-ssl
firefox-esr-latest: installer
maple:
firefox-beta-latest-ssl: installer-ssl
firefox-beta-latest: installer
firefox-beta-stub: stub-installer
default: {} default: {}
partner-bouncer-products-per-alias: partner-bouncer-products-per-alias:
by-project: by-release-type:
mozilla-beta: beta:
partner-firefox-beta-PARTNER-latest: installer partner-firefox-beta-PARTNER-latest: installer
partner-firefox-beta-PARTNER-stub: stub-installer partner-firefox-beta-PARTNER-stub: stub-installer
mozilla-release: release.*:
partner-firefox-release-PARTNER-latest: installer partner-firefox-release-PARTNER-latest: installer
partner-firefox-release-PARTNER-stub: stub-installer partner-firefox-release-PARTNER-stub: stub-installer
default: {} default: {}

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

@ -43,14 +43,14 @@ def make_task_worker(config, jobs):
job, job,
"bouncer-products-per-alias", "bouncer-products-per-alias",
item_name=job["name"], item_name=job["name"],
project=config.params["project"], **{"release-type": config.params["release_type"]},
) )
if "partner-bouncer-products-per-alias" in job: if "partner-bouncer-products-per-alias" in job:
resolve_keyed_by( resolve_keyed_by(
job, job,
"partner-bouncer-products-per-alias", "partner-bouncer-products-per-alias",
item_name=job["name"], item_name=job["name"],
project=config.params["project"], **{"release-type": config.params["release_type"]},
) )
job["worker"]["entries"] = craft_bouncer_entries(config, job) job["worker"]["entries"] = craft_bouncer_entries(config, job)