Bug 1900543 - Update comm_taskgraph to support ESR 128. r=rjl

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Daniel Darnell 2024-06-07 22:13:58 +00:00
Родитель e08793bb32
Коммит 9a50afd431
17 изменённых файлов: 34 добавлений и 34 удалений

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

@ -65,9 +65,9 @@ PER_PROJECT_PARAMETERS = {
"target_tasks_method": "mozilla_release_tasks",
"release_type": "release",
},
"comm-esr115": {
"target_tasks_method": "mozilla_esr115_tasks",
"release_type": "esr115",
"comm-esr128": {
"target_tasks_method": "mozilla_esr128_tasks",
"release_type": "esr128",
},
}

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

@ -29,8 +29,8 @@ RELEASE_TAG_RE = r"^FIREFOX_{major_version}_{minor_version}[\dbesr_]+(RELEASE|BU
BEHAVIOR_2_GECKO_REPO = {
"comm-beta-to-release": "mozilla-release",
"comm-release-to-esr": "mozilla-esr115",
"comm-bump-esr115": "mozilla-esr115",
"comm-release-to-esr": "mozilla-esr128",
"comm-bump-esr128": "mozilla-esr128",
}
@ -144,7 +144,7 @@ def pin_gecko_rev_yml(config, tasks):
gecko_repo = BEHAVIOR_2_GECKO_REPO[behavior]
merge_config = task["worker"]["merge-info"]
if behavior == "comm-bump-esr115":
if behavior == "comm-bump-esr128":
thunderbird_version = get_thunderbird_version(merge_config["to-repo"])
thunderbird_version = thunderbird_version.bump("minor_number")
gecko_rev_yml = get_gecko_rev_yml(merge_config["to-repo"])

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

@ -29,7 +29,7 @@ INCLUDE_VERSION_REGEXES = {
# Same as nonbeta, except for the esr suffix
"esr": r"'^\d+\.\d+(\.\d+)?esr$'",
# Previous esr versions, for update testing before we update users to a new esr
"esr115-next": r"'^(91|102)\.\d+(\.\d+)?$'",
"esr128-next": r"'^(91|102|115)\.\d+(\.\d+)?$'",
}
MAR_CHANNEL_ID_OVERRIDE_REGEXES = {

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

@ -18,7 +18,7 @@ RELEASE_PROJECTS = {
"comm-central",
"comm-beta",
"comm-release",
"comm-esr115",
"comm-esr128",
}
RELEASE_PROMOTION_PROJECTS = {
@ -56,7 +56,7 @@ SIGNING_SCOPE_ALIAS_TO_PROJECT = [
{
"comm-beta",
"comm-release",
"comm-esr115",
"comm-esr128",
},
],
]
@ -75,7 +75,7 @@ BEETMOVER_SCOPE_ALIAS_TO_PROJECT = [
{
"comm-beta",
"comm-release",
"comm-esr115",
"comm-esr128",
},
],
]
@ -104,9 +104,9 @@ BALROG_SCOPE_ALIAS_TO_PROJECT = [
},
],
[
"esr115",
"esr128",
{
"comm-esr115",
"comm-esr128",
},
],
]

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

@ -162,11 +162,11 @@ merge-automation:
replacements:
- - .gecko_rev.yml
- "GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/releases/mozilla-release"
- "GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/releases/mozilla-esr115"
- "GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/releases/mozilla-esr128"
merge-old-head: false
end-tag: "ESR_{major_version}_BASE"
to-repo: 'https://hg.mozilla.org/releases/comm-esr115'
to-branch: 'comm-esr115'
to-repo: 'https://hg.mozilla.org/releases/comm-esr128'
to-branch: 'comm-esr128'
comm-bump-central:
fetch-version-from: "mail/config/version.txt"
version-files:
@ -187,7 +187,7 @@ merge-automation:
end-tag: 'NIGHTLY_{major_version}_END'
to-repo: 'https://hg.mozilla.org/comm-central'
to-branch: 'comm'
comm-bump-esr115:
comm-bump-esr128:
fetch-version-from: "mail/config/version.txt"
version-files:
- filename: "mail/config/version.txt"
@ -196,8 +196,8 @@ merge-automation:
version-bump: "minor"
replacements: []
merge-old-head: false
to-repo: 'https://hg.mozilla.org/releases/comm-esr115'
to-branch: 'comm-esr115'
to-repo: 'https://hg.mozilla.org/releases/comm-esr128'
to-branch: 'comm-esr128'
scriptworker:
scope-prefix: 'project:comm:thunderbird:releng'

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

@ -34,13 +34,13 @@ jobs:
by-release-type:
beta: [43]
release: [17892]
esr115: [17886]
esr128: [17923]
default: []
staging:
by-release-type:
beta: [43]
release: [912]
esr115: [916]
esr128: [3086]
default: []
background-rate:
by-release-type:

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

@ -45,7 +45,7 @@ jobs:
by-release-type:
beta: ["thunderbird-beta-cdntest", "thunderbird-beta-localtest"]
release(-rc)?: ["thunderbird-release-cdntest", "thunderbird-release-localtest"]
esr115: ["thunderbird-esr115-cdntest", "thunderbird-esr115-localtest"]
esr128: ["thunderbird-esr128-cdntest", "thunderbird-esr128-localtest"]
default: []
platforms: ["linux", "linux64", "macosx64", "win32", "win64"]
treeherder:

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

@ -54,7 +54,7 @@ jobs:
thunderbird-esr-latest: installer
thunderbird-esr-msi-latest-ssl: msi
thunderbird-esr-msix-latest-ssl: msix
esrXXX: # XXX - to change when we branch next ESR
esr128:
thunderbird-esr-next-latest-ssl: installer-ssl
thunderbird-esr-next-latest: installer
thunderbird-esr-next-msi-latest-ssl: msi

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

@ -18,7 +18,7 @@ transforms:
job-defaults:
name: final-verify
run-on-projects: [] # to make sure this never runs as part of CI
run-on-releases: [beta, esr115] # Remove after shipping first comm-release
run-on-releases: [beta, esr128] # Remove after shipping first comm-release
worker-type: b-linux-gcp
worker:
docker-image:

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

@ -16,7 +16,7 @@ kind-dependencies:
job-defaults:
description: Pushes Flatpaks onto Flathub
run-on-projects: [] # to make sure this never runs as part of CI
run-on-releases: [beta]
run-on-releases: [beta, esr128]
shipping-phase: ship
treeherder:
platform: linux64/opt

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

@ -16,7 +16,7 @@ kind-dependencies:
job-defaults:
description: Generates flatpak by repackaging the existing .tar.bz2
run-on-projects: [] # to make sure this never runs as part of CI
run-on-releases: [beta, release]
run-on-releases: [beta, esr128]
shipping-phase: promote
scopes: []
treeherder:

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

@ -29,7 +29,7 @@ jobs:
PATH: /builds/worker/bin:/usr/local/bin:/usr/bin:/bin
channel:
by-project:
comm-esr115:
comm-esr128:
by-platform:
# ja-JP-mac is only langpack on mac, and is unlisted always
macosx64.*: unlisted

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

@ -16,7 +16,7 @@ kind-dependencies:
job-defaults:
description: Generates snap by repackaging the existing .tar.bz2
run-on-projects: [] # to make sure this never runs as part of CI
run-on-releases: [beta, esr115]
run-on-releases: [beta, esr128]
shipping-phase: promote
scopes: []
treeherder:

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

@ -13,7 +13,7 @@ transforms:
job-defaults:
name: update-verify-config-next
run-on-projects: [] # to make sure this never runs as part of CI
run-on-releases: [esr115]
run-on-releases: [esr128]
shipping-phase: promote
worker-type: b-linux-gcp
worker:
@ -53,8 +53,8 @@ job-defaults:
updater-platform: linux-x86_64
product: thunderbird
channel: "esr-localtest-next"
include-version: esr115-next
last-watershed: "91.9.0"
include-version: esr128-next
last-watershed: "115.10.2"
jobs:
thunderbird-next-linux:

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

@ -13,7 +13,7 @@ transforms:
job-defaults:
name: update-verify-config
run-on-projects: [] # to make sure this never runs as part of CI
run-on-releases: [beta, esr115] # Remove after shipping first comm-release
run-on-releases: [beta, esr128] # Remove after shipping first comm-release
shipping-phase: promote
worker-type: b-linux-gcp
worker:
@ -56,7 +56,7 @@ job-defaults:
by-release-type:
beta: "79.0b2"
release(-rc)?: "116.0"
esr115: "115.10.2"
esr128: "128.0esr"
default: "default"
jobs:

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

@ -20,7 +20,7 @@ transforms:
job-defaults:
name: update-verify-next
run-on-projects: [] # to make sure this never runs as part of CI
run-on-releases: [esr115]
run-on-releases: [esr128]
shipping-phase: promote
worker-type: b-linux-gcp
worker:

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

@ -20,7 +20,7 @@ transforms:
job-defaults:
name: update-verify
run-on-projects: [] # to make sure this never runs as part of CI
run-on-releases: [beta, esr115] # Remove after shipping first comm-release
run-on-releases: [beta, esr128] # Remove after shipping first comm-release
shipping-phase: promote
worker-type: b-linux-gcp
worker: