nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1766928 - Configure Taskgraph to support esr102 r=releng-reviewers,jcristau,gbrown,aki

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D145900
This commit is contained in:
Gabriel Bustamante 2022-05-16 16:13:57 +00:00
parent 460fa55baf
commit b094ef5722
21 changed files with 87 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
.cron.yml
View file

@ -122,6 +122,7 @@ jobs:
- mozilla-beta
- mozilla-release
- mozilla-esr91
- mozilla-esr102
- elm
# For all non m-c jobs we just run once daily matching the 10 UTC
# nightly which is designed to align with searchfox's AWS cron
@ -221,6 +222,7 @@ jobs:
- mozilla-beta
- mozilla-release
- mozilla-esr91
- mozilla-esr102
when:
- {weekday: 'Monday', hour: 8, minute: 0}
- {weekday: 'Thursday', hour: 8, minute: 0}

1
python/mozbuild/mozbuild/artifacts.py
View file

@ -104,6 +104,7 @@ class ArtifactJob(object):
# The list below list should be updated when we have new ESRs.
esr_candidate_trees = [
"releases/mozilla-esr91",
"releases/mozilla-esr102",
]
try_tree = "try"

2
taskcluster/ci/build/linux.yml
View file

@ -566,7 +566,7 @@ linux/opt:
secrets: true
tooltool-downloads: public
need-xvfb: true
run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr91']
run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr91', 'mozilla-esr102']
use-sccache: true
fetches:
toolchain:

8
taskcluster/ci/build/windows-mingw.yml
View file

@ -34,7 +34,7 @@ win32-mingwclang/opt:
- builds/releng_base_windows_32_mingw_builds.py
- builds/releng_sub_windows_configs/32_mingwclang.py
mozconfig-variant: mingwclang
run-on-projects: ['mozilla-central', 'mozilla-esr91']
run-on-projects: ['mozilla-central', 'mozilla-esr91', 'mozilla-esr102']
use-sccache: true
fetches:
toolchain:
@ -71,7 +71,7 @@ win32-mingwclang/debug:
- builds/releng_base_windows_32_mingw_builds.py
- builds/releng_sub_windows_configs/32_mingwclang.py
mozconfig-variant: mingwclang-debug
run-on-projects: ['mozilla-central', 'mozilla-esr91']
run-on-projects: ['mozilla-central', 'mozilla-esr91', 'mozilla-esr102']
use-sccache: true
fetches:
toolchain:
@ -108,7 +108,7 @@ win64-mingwclang/opt:
- builds/releng_base_windows_64_mingw_builds.py
- builds/releng_sub_windows_configs/64_mingwclang.py
mozconfig-variant: mingwclang
run-on-projects: ['mozilla-central', 'mozilla-esr91']
run-on-projects: ['mozilla-central', 'mozilla-esr91', 'mozilla-esr102']
use-sccache: true
fetches:
toolchain:
@ -145,7 +145,7 @@ win64-mingwclang/debug:
- builds/releng_base_windows_64_mingw_builds.py
- builds/releng_sub_windows_configs/64_mingwclang.py
mozconfig-variant: mingwclang-debug
run-on-projects: ['mozilla-central', 'mozilla-esr91']
run-on-projects: ['mozilla-central', 'mozilla-esr91', 'mozilla-esr102']
use-sccache: true
fetches:
toolchain:

25
taskcluster/ci/config.yml
View file

@ -365,6 +365,18 @@ merge-automation:
from-branch: 'release'
to-repo: 'https://hg.mozilla.org/releases/mozilla-esr91'
to-branch: 'esr91'
release-to-esr102:
fetch-version-from: "browser/config/version.txt"
version-files:
- filename: "browser/config/version_display.txt"
new-suffix: 'esr'
replacements: []
merge-old-head: false
base-tag: "FIREFOX_ESR_{major_version}_BASE"
from-repo: 'https://hg.mozilla.org/releases/mozilla-release'
from-branch: 'release'
to-repo: 'https://hg.mozilla.org/releases/mozilla-esr102'
to-branch: 'esr102'
bump-central:
fetch-version-from: "browser/config/version.txt"
version-files:
@ -401,6 +413,19 @@ merge-automation:
merge-old-head: false
to-repo: 'https://hg.mozilla.org/releases/mozilla-esr91'
to-branch: 'esr91'
bump-esr102:
fetch-version-from: "browser/config/version.txt"
version-files:
- filename: "config/milestone.txt"
version-bump: "minor"
- filename: "browser/config/version.txt"
version-bump: "minor"
- filename: "browser/config/version_display.txt"
version-bump: "minor"
replacements: []
merge-old-head: false
to-repo: 'https://hg.mozilla.org/releases/mozilla-esr102'
to-branch: 'esr102'
scriptworker:
# See additional configuration in taskcluster/gecko_taskgraph/util/scriptworker.py

1
taskcluster/ci/cron-bouncer-check/kind.yml
View file

@ -54,6 +54,7 @@ jobs:
mozilla-beta: LATEST_FIREFOX_RELEASED_DEVEL_VERSION
mozilla-release: LATEST_FIREFOX_VERSION
mozilla-esr91: FIREFOX_ESR
mozilla-esr102: FIREFOX_ESR_NEXT
default: LATEST_FIREFOX_DEVEL_VERSION
products-url: https://product-details.mozilla.org/1.0/firefox_versions.json
treeherder:

2
taskcluster/ci/release-balrog-scheduling/kind.yml
View file

@ -36,12 +36,14 @@ jobs:
beta: [32]
release: [145]
esr91: [17638]
esr102: [17770]
default: []
staging:
by-release-type:
beta: [32]
release: [145]
esr91: [889]
esr102: [902]
default: []
background-rate:
by-release-type:

1
taskcluster/ci/release-balrog-submit-toplevel/kind.yml
View file

@ -47,6 +47,7 @@ jobs:
beta: ["firefox-beta-cdntest", "firefox-beta-localtest"]
release(-rc)?: ["firefox-release-cdntest", "firefox-release-localtest"]
esr91: ["firefox-esr91-cdntest", "firefox-esr91-localtest"]
esr102: ["firefox-esr102-cdntest", "firefox-esr102-localtest"]
default: []
platforms: ["linux", "linux64", "macosx64", "win32", "win64", "win64-aarch64"]
treeherder:

1
taskcluster/ci/release-bouncer-aliases/kind.yml
View file

@ -69,6 +69,7 @@ jobs:
firefox-esr-latest: installer
firefox-esr-msi-latest-ssl: msi
firefox-esr-pkg-latest-ssl: pkg
mozilla-esr102:
# ... these point to the newer branch
firefox-esr-next-latest-ssl: installer-ssl
firefox-esr-next-latest: installer

1
taskcluster/ci/release-bouncer-sub/kind.yml
View file

@ -44,6 +44,7 @@ jobs:
by-release-type:
default: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'stub-installer', 'msi', 'msix', 'pkg']
esr91: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'msi', 'pkg']
esr102: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'msi', 'msix', 'pkg']
shipping-product: firefox
treeherder:
platform: firefox-release/opt

4
taskcluster/ci/release-update-verify-config-next/kind.yml
View file

@ -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: [esr91]
run-on-releases: [esr102]
shipping-phase: promote
worker-type: b-linux
worker:
@ -52,7 +52,7 @@ job-defaults:
updater-platform: linux-x86_64
product: firefox
channel: "esr-localtest-next"
include-version: esr91-next
include-version: esr102-next
last-watershed: "68.0esr"
jobs:

1
taskcluster/ci/release-update-verify-config/kind.yml
View file

@ -54,6 +54,7 @@ job-defaults:
beta: "72.0"
release(-rc)?: "72.0.2"
esr91: "68.0esr"
esr102: "102.0esr"
default: "default"
jobs:

2
taskcluster/ci/release-update-verify-next/kind.yml
View file

@ -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: [esr91]
run-on-releases: [esr102]
shipping-phase: promote
worker-type: b-linux
worker:

1
taskcluster/docs/attributes.rst
View file

@ -46,6 +46,7 @@ Project names are the repositories. They can be:
* `mozilla-beta`
* `mozilla-release`
* `mozilla-esr91`
* `mozilla-esr102`
* ... A partial list can be found in taskcluster/gecko_taskgraph/util/attributes.py
For try, this attribute applies only if ``-p all`` is specified. All jobs can

2
taskcluster/docs/parameters.rst
View file

@ -179,7 +179,7 @@ Release Promotion
Specify the next version for version bump tasks.
``release_type``
The type of release being promoted. One of "nightly", "beta", "esr91", "release-rc", or "release".
The type of release being promoted. One of "nightly", "beta", "esr91", "esr102", "release-rc", or "release".
``release_eta``
The time and date when a release is scheduled to live. This value is passed to Balrog.

4
taskcluster/gecko_taskgraph/decision.py
View file

@ -83,6 +83,10 @@ PER_PROJECT_PARAMETERS = {
"target_tasks_method": "mozilla_esr91_tasks",
"release_type": "esr91",
},
"mozilla-esr102": {
"target_tasks_method": "mozilla_esr102_tasks",
"release_type": "esr102",
},
"pine": {
"target_tasks_method": "pine_tasks",
},

25
taskcluster/gecko_taskgraph/target_tasks.py
View file

@ -559,6 +559,30 @@ def target_tasks_mozilla_esr91(full_task_graph, parameters, graph_config):
return [l for l, t in full_task_graph.tasks.items() if filter(t)]
@_target_task("mozilla_esr102_tasks")
def target_tasks_mozilla_esr102(full_task_graph, parameters, graph_config):
"""Select the set of tasks required for a promotable beta or release build
of desktop, without android CI. The candidates build process involves a pipeline
of builds and signing, but does not include beetmover or balrog jobs."""
def filter(task):
if not filter_release_tasks(task, parameters):
return False
if not standard_filter(task, parameters):
return False
platform = task.attributes.get("build_platform")
# Android is not built on esr102.
if platform and "android" in platform:
return False
return True
return [l for l, t in full_task_graph.tasks.items() if filter(t)]
@_target_task("promote_desktop")
def target_tasks_promote_desktop(full_task_graph, parameters, graph_config):
"""Select the superset of tasks required to promote a beta or release build
@ -1081,6 +1105,7 @@ def target_tasks_release_simulation(full_task_graph, parameters, graph_config):
"beta": "mozilla-beta",
"release": "mozilla-release",
"esr91": "mozilla-esr91",
"esr102": "mozilla-esr102",
}
target_project = project_by_release.get(parameters["release_type"])
if target_project is None:

4
taskcluster/gecko_taskgraph/transforms/update_verify_config.py
View file

@ -29,8 +29,8 @@ INCLUDE_VERSION_REGEXES = {
"nonbeta": r"'^\d+\.\d+(\.\d+)?$'",
# 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 esr91
"esr91-next": r"'^(52|60|68|78)+\.\d+(\.\d+)?esr$'",
# Previous esr versions, for update testing before we update users to esr102
"esr102-next": r"'^(52|60|68|78|91)+\.\d+(\.\d+)?esr$'",
# Previous Thunderbird major versions. Same idea as esrXX-next, no esr suffix
"thunderbird91-next": r"'^78\.\d+(\.\d+)?$'",
}

1
taskcluster/gecko_taskgraph/util/attributes.py
View file

@ -17,6 +17,7 @@ RELEASE_PROJECTS = {
"mozilla-beta",
"mozilla-release",
"mozilla-esr91",
"mozilla-esr102",
"comm-central",
"comm-beta",
"comm-esr91",

9
taskcluster/gecko_taskgraph/util/scriptworker.py
View file

@ -61,6 +61,7 @@ SIGNING_SCOPE_ALIAS_TO_PROJECT = [
"mozilla-beta",
"mozilla-release",
"mozilla-esr91",
"mozilla-esr102",
"comm-beta",
"comm-esr91",
},
@ -106,6 +107,7 @@ BEETMOVER_SCOPE_ALIAS_TO_PROJECT = [
"mozilla-beta",
"mozilla-release",
"mozilla-esr91",
"mozilla-esr102",
"comm-beta",
"comm-esr91",
},
@ -171,6 +173,12 @@ BALROG_SCOPE_ALIAS_TO_PROJECT = [
"mozilla-esr91",
},
],
[
"esr102",
{
"mozilla-esr102",
},
],
]
"""Map the balrog scope aliases to the actual scopes.
@ -181,6 +189,7 @@ BALROG_SERVER_SCOPES = {
"beta": "balrog:server:beta",
"release": "balrog:server:release",
"esr91": "balrog:server:esr",
"esr102": "balrog:server:esr",
"default": "balrog:server:dep",
}

1
testing/web-platform/manifestdownload.py
View file

@ -93,6 +93,7 @@ def taskcluster_url(logger, commits):
"mozilla-central": "mozilla-central",
"integration/autoland": "autoland",
"releases/mozilla-esr91": "mozilla-esr91",
"releases/mozilla-esr102": "mozilla-esr102",
}
cset_url = (
"https://hg.mozilla.org/{repo}/json-pushes?"