From ce8360e5724cca3fdb104e3d2225c023e1d82cea Mon Sep 17 00:00:00 2001 From: Johan Lorenzo Date: Mon, 16 Apr 2018 16:25:26 +0200 Subject: [PATCH] Bug 1453261 - adjust bouncer kinds to handle esr60. r=rail,mtabara CLOSED TREE MozReview-Commit-ID: EpzlzLoQFLk --HG-- extra : histedit_source : 786c95dc3a579c78ece2094d13a75e13f443fd50%2C5ce141423b18b432d1d6f1a721335f1ab49f636b --- .../ci/release-bouncer-aliases/kind.yml | 8 +- taskcluster/ci/release-bouncer-check/kind.yml | 8 +- .../releases/dev_bouncer_firefox_esr.py | 123 ++++++++++++++++++ 3 files changed, 135 insertions(+), 4 deletions(-) create mode 100644 testing/mozharness/configs/releases/dev_bouncer_firefox_esr.py diff --git a/taskcluster/ci/release-bouncer-aliases/kind.yml b/taskcluster/ci/release-bouncer-aliases/kind.yml index a4fcc3c468ba..e35968421e22 100644 --- a/taskcluster/ci/release-bouncer-aliases/kind.yml +++ b/taskcluster/ci/release-bouncer-aliases/kind.yml @@ -19,6 +19,7 @@ job-defaults: by-project: mozilla-beta: scriptworker-prov-v1/bouncer-v1 mozilla-release: scriptworker-prov-v1/bouncer-v1 + mozilla-esr60: scriptworker-prov-v1/bouncer-v1 default: scriptworker-prov-v1/bouncer-dev worker: implementation: bouncer-aliases @@ -30,6 +31,9 @@ job-defaults: mozilla-release: - project:releng:bouncer:action:aliases - project:releng:bouncer:server:production + mozilla-esr60: + - project:releng:bouncer:action:aliases + - project:releng:bouncer:server:production default: - project:releng:bouncer:action:aliases - project:releng:bouncer:server:staging @@ -71,14 +75,14 @@ jobs: firefox-stub: stub-installer mozilla-esr60: firefox-esr-latest-ssl: installer-ssl - firefox-latest-ssl: installer + firefox-esr-latest: installer birch: firefox-latest-ssl: installer-ssl firefox-latest: installer firefox-stub: stub-installer jamun: firefox-esr-latest-ssl: installer-ssl - firefox-latest-ssl: installer + firefox-esr-latest: installer maple: firefox-beta-latest-ssl: installer-ssl firefox-beta-latest: installer diff --git a/taskcluster/ci/release-bouncer-check/kind.yml b/taskcluster/ci/release-bouncer-check/kind.yml index 42007a8289b0..7085098bea40 100644 --- a/taskcluster/ci/release-bouncer-check/kind.yml +++ b/taskcluster/ci/release-bouncer-check/kind.yml @@ -43,10 +43,14 @@ jobs: run: config: by-project: - mozilla-release: - - releases/bouncer_firefox_release.py mozilla-beta: - releases/bouncer_firefox_beta.py + mozilla-release: + - releases/bouncer_firefox_release.py + mozilla-esr60: + - releases/bouncer_firefox_esr.py + jamun: + - releases/dev_bouncer_firefox_esr.py default: - releases/dev_bouncer_firefox_beta.py treeherder: diff --git a/testing/mozharness/configs/releases/dev_bouncer_firefox_esr.py b/testing/mozharness/configs/releases/dev_bouncer_firefox_esr.py new file mode 100644 index 000000000000..efee53001b58 --- /dev/null +++ b/testing/mozharness/configs/releases/dev_bouncer_firefox_esr.py @@ -0,0 +1,123 @@ +# lint_ignore=E501 +config = { + "shipped-locales-url": "https://hg.mozilla.org/%(repo)s/raw-file/%(revision)s/browser/locales/shipped-locales", + "bouncer_prefix": "https://bouncer-bouncer-releng.stage.mozaws.net/", + "products": { + "installer": { + "product-name": "Firefox-%(version)s", + "check_uptake": True, + "alias": "firefox-esr-latest", + "ssl-only": True, + "add-locales": True, + "paths": { + "linux": { + "path": "/firefox/releases/%(version)s/linux-i686/:lang/firefox-%(version)s.tar.bz2", + "bouncer-platform": "linux", + }, + "linux64": { + "path": "/firefox/releases/%(version)s/linux-x86_64/:lang/firefox-%(version)s.tar.bz2", + "bouncer-platform": "linux64", + }, + "macosx64": { + "path": "/firefox/releases/%(version)s/mac/:lang/Firefox%%20%(version)s.dmg", + "bouncer-platform": "osx", + }, + "win32": { + "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.exe", + "bouncer-platform": "win", + }, + "win64": { + "path": "/firefox/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.exe", + "bouncer-platform": "win64", + }, + }, + }, + "installer-ssl": { + "product-name": "Firefox-%(version)s-SSL", + "check_uptake": True, + "alias": "firefox-esr-latest-ssl", + "ssl-only": True, + "add-locales": True, + "paths": { + "linux": { + "path": "/firefox/releases/%(version)s/linux-i686/:lang/firefox-%(version)s.tar.bz2", + "bouncer-platform": "linux", + }, + "linux64": { + "path": "/firefox/releases/%(version)s/linux-x86_64/:lang/firefox-%(version)s.tar.bz2", + "bouncer-platform": "linux64", + }, + "macosx64": { + "path": "/firefox/releases/%(version)s/mac/:lang/Firefox%%20%(version)s.dmg", + "bouncer-platform": "osx", + }, + "win32": { + "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.exe", + "bouncer-platform": "win", + }, + "win64": { + "path": "/firefox/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.exe", + "bouncer-platform": "win64", + }, + }, + }, + "complete-mar": { + "product-name": "Firefox-%(version)s-Complete", + "check_uptake": True, + "ssl-only": False, + "add-locales": True, + "paths": { + "linux": { + "path": "/firefox/releases/%(version)s/update/linux-i686/:lang/firefox-%(version)s.complete.mar", + "bouncer-platform": "linux", + }, + "linux64": { + "path": "/firefox/releases/%(version)s/update/linux-x86_64/:lang/firefox-%(version)s.complete.mar", + "bouncer-platform": "linux64", + }, + "macosx64": { + "path": "/firefox/releases/%(version)s/update/mac/:lang/firefox-%(version)s.complete.mar", + "bouncer-platform": "osx", + }, + "win32": { + "path": "/firefox/releases/%(version)s/update/win32/:lang/firefox-%(version)s.complete.mar", + "bouncer-platform": "win", + }, + "win64": { + "path": "/firefox/releases/%(version)s/update/win64/:lang/firefox-%(version)s.complete.mar", + "bouncer-platform": "win64", + }, + }, + }, + }, + "partials": { + "releases-dir": { + "product-name": "Firefox-%(version)s-Partial-%(prev_version)s", + "check_uptake": True, + "ssl-only": False, + "add-locales": True, + "paths": { + "linux": { + "path": "/firefox/releases/%(version)s/update/linux-i686/:lang/firefox-%(prev_version)s-%(version)s.partial.mar", + "bouncer-platform": "linux", + }, + "linux64": { + "path": "/firefox/releases/%(version)s/update/linux-x86_64/:lang/firefox-%(prev_version)s-%(version)s.partial.mar", + "bouncer-platform": "linux64", + }, + "macosx64": { + "path": "/firefox/releases/%(version)s/update/mac/:lang/firefox-%(prev_version)s-%(version)s.partial.mar", + "bouncer-platform": "osx", + }, + "win32": { + "path": "/firefox/releases/%(version)s/update/win32/:lang/firefox-%(prev_version)s-%(version)s.partial.mar", + "bouncer-platform": "win", + }, + "win64": { + "path": "/firefox/releases/%(version)s/update/win64/:lang/firefox-%(prev_version)s-%(version)s.partial.mar", + "bouncer-platform": "win64", + }, + }, + }, + }, +}