forked from mirrors/gecko-dev
Bug 1786291 - Remove esr91 references r=jcristau
Differential Revision: https://phabricator.services.mozilla.com/D156972
This commit is contained in:
parent
95740f9c4c
commit
b984b3449b
16 changed files with 6 additions and 77 deletions
|
|
@ -119,7 +119,6 @@ jobs:
|
||||||
run-on-projects:
|
run-on-projects:
|
||||||
- mozilla-beta
|
- mozilla-beta
|
||||||
- mozilla-release
|
- mozilla-release
|
||||||
- mozilla-esr91
|
|
||||||
- mozilla-esr102
|
- mozilla-esr102
|
||||||
- elm
|
- elm
|
||||||
# For all non m-c jobs we just run once daily matching the 10 UTC
|
# For all non m-c jobs we just run once daily matching the 10 UTC
|
||||||
|
|
@ -193,7 +192,6 @@ jobs:
|
||||||
- mozilla-central
|
- mozilla-central
|
||||||
- mozilla-beta
|
- mozilla-beta
|
||||||
- mozilla-release
|
- mozilla-release
|
||||||
- mozilla-esr91
|
|
||||||
- mozilla-esr102
|
- mozilla-esr102
|
||||||
when:
|
when:
|
||||||
by-project:
|
by-project:
|
||||||
|
|
@ -207,9 +205,6 @@ jobs:
|
||||||
mozilla-release:
|
mozilla-release:
|
||||||
- {hour: 7, minute: 0}
|
- {hour: 7, minute: 0}
|
||||||
- {hour: 19, minute: 0}
|
- {hour: 19, minute: 0}
|
||||||
mozilla-esr91:
|
|
||||||
- {hour: 7, minute: 0}
|
|
||||||
- {hour: 19, minute: 0}
|
|
||||||
mozilla-esr102:
|
mozilla-esr102:
|
||||||
- {hour: 7, minute: 0}
|
- {hour: 7, minute: 0}
|
||||||
- {hour: 19, minute: 0}
|
- {hour: 19, minute: 0}
|
||||||
|
|
@ -223,7 +218,6 @@ jobs:
|
||||||
- mozilla-central
|
- mozilla-central
|
||||||
- mozilla-beta
|
- mozilla-beta
|
||||||
- mozilla-release
|
- mozilla-release
|
||||||
- mozilla-esr91
|
|
||||||
- mozilla-esr102
|
- mozilla-esr102
|
||||||
when:
|
when:
|
||||||
- {weekday: 'Monday', hour: 8, minute: 0}
|
- {weekday: 'Monday', hour: 8, minute: 0}
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,6 @@ class ArtifactJob(object):
|
||||||
]
|
]
|
||||||
# The list below list should be updated when we have new ESRs.
|
# The list below list should be updated when we have new ESRs.
|
||||||
esr_candidate_trees = [
|
esr_candidate_trees = [
|
||||||
"releases/mozilla-esr91",
|
|
||||||
"releases/mozilla-esr102",
|
"releases/mozilla-esr102",
|
||||||
]
|
]
|
||||||
try_tree = "try"
|
try_tree = "try"
|
||||||
|
|
@ -773,7 +772,6 @@ class ThunderbirdMixin(object):
|
||||||
]
|
]
|
||||||
# The list below list should be updated when we have new ESRs.
|
# The list below list should be updated when we have new ESRs.
|
||||||
esr_candidate_trees = [
|
esr_candidate_trees = [
|
||||||
"releases/comm-esr91",
|
|
||||||
"releases/comm-esr102",
|
"releases/comm-esr102",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -565,7 +565,7 @@ linux/opt:
|
||||||
secrets: true
|
secrets: true
|
||||||
tooltool-downloads: public
|
tooltool-downloads: public
|
||||||
need-xvfb: true
|
need-xvfb: true
|
||||||
run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr91', 'mozilla-esr102']
|
run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr102']
|
||||||
use-sccache: true
|
use-sccache: true
|
||||||
fetches:
|
fetches:
|
||||||
toolchain:
|
toolchain:
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ win32-mingwclang/opt:
|
||||||
- builds/releng_base_windows_32_mingw_builds.py
|
- builds/releng_base_windows_32_mingw_builds.py
|
||||||
- builds/releng_sub_windows_configs/32_mingwclang.py
|
- builds/releng_sub_windows_configs/32_mingwclang.py
|
||||||
mozconfig-variant: mingwclang
|
mozconfig-variant: mingwclang
|
||||||
run-on-projects: ['mozilla-central', 'mozilla-esr91', 'mozilla-esr102']
|
run-on-projects: ['mozilla-central', 'mozilla-esr102']
|
||||||
use-sccache: true
|
use-sccache: true
|
||||||
fetches:
|
fetches:
|
||||||
toolchain:
|
toolchain:
|
||||||
|
|
@ -71,7 +71,7 @@ win32-mingwclang/debug:
|
||||||
- builds/releng_base_windows_32_mingw_builds.py
|
- builds/releng_base_windows_32_mingw_builds.py
|
||||||
- builds/releng_sub_windows_configs/32_mingwclang.py
|
- builds/releng_sub_windows_configs/32_mingwclang.py
|
||||||
mozconfig-variant: mingwclang-debug
|
mozconfig-variant: mingwclang-debug
|
||||||
run-on-projects: ['mozilla-central', 'mozilla-esr91', 'mozilla-esr102']
|
run-on-projects: ['mozilla-central', 'mozilla-esr102']
|
||||||
use-sccache: true
|
use-sccache: true
|
||||||
fetches:
|
fetches:
|
||||||
toolchain:
|
toolchain:
|
||||||
|
|
@ -108,7 +108,7 @@ win64-mingwclang/opt:
|
||||||
- builds/releng_base_windows_64_mingw_builds.py
|
- builds/releng_base_windows_64_mingw_builds.py
|
||||||
- builds/releng_sub_windows_configs/64_mingwclang.py
|
- builds/releng_sub_windows_configs/64_mingwclang.py
|
||||||
mozconfig-variant: mingwclang
|
mozconfig-variant: mingwclang
|
||||||
run-on-projects: ['mozilla-central', 'mozilla-esr91', 'mozilla-esr102']
|
run-on-projects: ['mozilla-central', 'mozilla-esr102']
|
||||||
use-sccache: true
|
use-sccache: true
|
||||||
fetches:
|
fetches:
|
||||||
toolchain:
|
toolchain:
|
||||||
|
|
@ -145,7 +145,7 @@ win64-mingwclang/debug:
|
||||||
- builds/releng_base_windows_64_mingw_builds.py
|
- builds/releng_base_windows_64_mingw_builds.py
|
||||||
- builds/releng_sub_windows_configs/64_mingwclang.py
|
- builds/releng_sub_windows_configs/64_mingwclang.py
|
||||||
mozconfig-variant: mingwclang-debug
|
mozconfig-variant: mingwclang-debug
|
||||||
run-on-projects: ['mozilla-central', 'mozilla-esr91', 'mozilla-esr102']
|
run-on-projects: ['mozilla-central', 'mozilla-esr102']
|
||||||
use-sccache: true
|
use-sccache: true
|
||||||
fetches:
|
fetches:
|
||||||
toolchain:
|
toolchain:
|
||||||
|
|
|
||||||
|
|
@ -389,19 +389,6 @@ merge-automation:
|
||||||
end-tag: 'FIREFOX_NIGHTLY_{major_version}_END'
|
end-tag: 'FIREFOX_NIGHTLY_{major_version}_END'
|
||||||
to-repo: 'https://hg.mozilla.org/mozilla-central'
|
to-repo: 'https://hg.mozilla.org/mozilla-central'
|
||||||
to-branch: 'central'
|
to-branch: 'central'
|
||||||
bump-esr91:
|
|
||||||
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-esr91'
|
|
||||||
to-branch: 'esr91'
|
|
||||||
bump-esr102:
|
bump-esr102:
|
||||||
fetch-version-from: "browser/config/version.txt"
|
fetch-version-from: "browser/config/version.txt"
|
||||||
version-files:
|
version-files:
|
||||||
|
|
|
||||||
|
|
@ -34,14 +34,12 @@ jobs:
|
||||||
by-release-type:
|
by-release-type:
|
||||||
beta: [32]
|
beta: [32]
|
||||||
release: [145]
|
release: [145]
|
||||||
esr91: [17638]
|
|
||||||
esr102: [17770]
|
esr102: [17770]
|
||||||
default: []
|
default: []
|
||||||
staging:
|
staging:
|
||||||
by-release-type:
|
by-release-type:
|
||||||
beta: [32]
|
beta: [32]
|
||||||
release: [145]
|
release: [145]
|
||||||
esr91: [889]
|
|
||||||
esr102: [902]
|
esr102: [902]
|
||||||
default: []
|
default: []
|
||||||
background-rate:
|
background-rate:
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,6 @@ jobs:
|
||||||
by-release-type:
|
by-release-type:
|
||||||
beta: ["firefox-beta-cdntest", "firefox-beta-localtest"]
|
beta: ["firefox-beta-cdntest", "firefox-beta-localtest"]
|
||||||
release(-rc)?: ["firefox-release-cdntest", "firefox-release-localtest"]
|
release(-rc)?: ["firefox-release-cdntest", "firefox-release-localtest"]
|
||||||
esr91: ["firefox-esr91-cdntest", "firefox-esr91-localtest"]
|
|
||||||
esr102: ["firefox-esr102-cdntest", "firefox-esr102-localtest"]
|
esr102: ["firefox-esr102-cdntest", "firefox-esr102-localtest"]
|
||||||
default: []
|
default: []
|
||||||
pin-channels:
|
pin-channels:
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,6 @@ jobs:
|
||||||
bouncer-products:
|
bouncer-products:
|
||||||
by-release-type:
|
by-release-type:
|
||||||
default: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'stub-installer', 'msi', 'msix', 'pkg']
|
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']
|
esr102: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'msi', 'msix', 'pkg']
|
||||||
shipping-product: firefox
|
shipping-product: firefox
|
||||||
treeherder:
|
treeherder:
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,6 @@ job-defaults:
|
||||||
by-release-type:
|
by-release-type:
|
||||||
beta: "72.0"
|
beta: "72.0"
|
||||||
release(-rc)?: "72.0.2"
|
release(-rc)?: "72.0.2"
|
||||||
esr91: "68.0esr"
|
|
||||||
esr102: "68.0esr"
|
esr102: "68.0esr"
|
||||||
default: "default"
|
default: "default"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,6 @@ Project names are the repositories. They can be:
|
||||||
* `mozilla-central`
|
* `mozilla-central`
|
||||||
* `mozilla-beta`
|
* `mozilla-beta`
|
||||||
* `mozilla-release`
|
* `mozilla-release`
|
||||||
* `mozilla-esr91`
|
|
||||||
* `mozilla-esr102`
|
* `mozilla-esr102`
|
||||||
* ... A partial list can be found in taskcluster/gecko_taskgraph/util/attributes.py
|
* ... A partial list can be found in taskcluster/gecko_taskgraph/util/attributes.py
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -179,7 +179,7 @@ Release Promotion
|
||||||
Specify the next version for version bump tasks.
|
Specify the next version for version bump tasks.
|
||||||
|
|
||||||
``release_type``
|
``release_type``
|
||||||
The type of release being promoted. One of "nightly", "beta", "esr91", "esr102", "release-rc", or "release".
|
The type of release being promoted. One of "nightly", "beta", "esr102", "release-rc", or "release".
|
||||||
|
|
||||||
``release_eta``
|
``release_eta``
|
||||||
The time and date when a release is scheduled to live. This value is passed to Balrog.
|
The time and date when a release is scheduled to live. This value is passed to Balrog.
|
||||||
|
|
|
||||||
|
|
@ -79,10 +79,6 @@ PER_PROJECT_PARAMETERS = {
|
||||||
"target_tasks_method": "mozilla_release_tasks",
|
"target_tasks_method": "mozilla_release_tasks",
|
||||||
"release_type": "release",
|
"release_type": "release",
|
||||||
},
|
},
|
||||||
"mozilla-esr91": {
|
|
||||||
"target_tasks_method": "mozilla_esr91_tasks",
|
|
||||||
"release_type": "esr91",
|
|
||||||
},
|
|
||||||
"mozilla-esr102": {
|
"mozilla-esr102": {
|
||||||
"target_tasks_method": "mozilla_esr102_tasks",
|
"target_tasks_method": "mozilla_esr102_tasks",
|
||||||
"release_type": "esr102",
|
"release_type": "esr102",
|
||||||
|
|
|
||||||
|
|
@ -532,30 +532,6 @@ def target_tasks_mozilla_release(full_task_graph, parameters, graph_config):
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
@_target_task("mozilla_esr91_tasks")
|
|
||||||
def target_tasks_mozilla_esr91(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 esr91.
|
|
||||||
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("mozilla_esr102_tasks")
|
@_target_task("mozilla_esr102_tasks")
|
||||||
def target_tasks_mozilla_esr102(full_task_graph, parameters, graph_config):
|
def target_tasks_mozilla_esr102(full_task_graph, parameters, graph_config):
|
||||||
"""Select the set of tasks required for a promotable beta or release build
|
"""Select the set of tasks required for a promotable beta or release build
|
||||||
|
|
@ -1101,7 +1077,6 @@ def target_tasks_release_simulation(full_task_graph, parameters, graph_config):
|
||||||
"nightly": "mozilla-central",
|
"nightly": "mozilla-central",
|
||||||
"beta": "mozilla-beta",
|
"beta": "mozilla-beta",
|
||||||
"release": "mozilla-release",
|
"release": "mozilla-release",
|
||||||
"esr91": "mozilla-esr91",
|
|
||||||
"esr102": "mozilla-esr102",
|
"esr102": "mozilla-esr102",
|
||||||
}
|
}
|
||||||
target_project = project_by_release.get(parameters["release_type"])
|
target_project = project_by_release.get(parameters["release_type"])
|
||||||
|
|
|
||||||
|
|
@ -16,11 +16,9 @@ RELEASE_PROJECTS = {
|
||||||
"mozilla-central",
|
"mozilla-central",
|
||||||
"mozilla-beta",
|
"mozilla-beta",
|
||||||
"mozilla-release",
|
"mozilla-release",
|
||||||
"mozilla-esr91",
|
|
||||||
"mozilla-esr102",
|
"mozilla-esr102",
|
||||||
"comm-central",
|
"comm-central",
|
||||||
"comm-beta",
|
"comm-beta",
|
||||||
"comm-esr91",
|
|
||||||
"comm-esr102",
|
"comm-esr102",
|
||||||
"oak",
|
"oak",
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -59,10 +59,8 @@ SIGNING_SCOPE_ALIAS_TO_PROJECT = [
|
||||||
{
|
{
|
||||||
"mozilla-beta",
|
"mozilla-beta",
|
||||||
"mozilla-release",
|
"mozilla-release",
|
||||||
"mozilla-esr91",
|
|
||||||
"mozilla-esr102",
|
"mozilla-esr102",
|
||||||
"comm-beta",
|
"comm-beta",
|
||||||
"comm-esr91",
|
|
||||||
"comm-esr102",
|
"comm-esr102",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|
@ -106,10 +104,8 @@ BEETMOVER_SCOPE_ALIAS_TO_PROJECT = [
|
||||||
{
|
{
|
||||||
"mozilla-beta",
|
"mozilla-beta",
|
||||||
"mozilla-release",
|
"mozilla-release",
|
||||||
"mozilla-esr91",
|
|
||||||
"mozilla-esr102",
|
"mozilla-esr102",
|
||||||
"comm-beta",
|
"comm-beta",
|
||||||
"comm-esr91",
|
|
||||||
"comm-esr102",
|
"comm-esr102",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|
@ -165,16 +161,9 @@ BALROG_SCOPE_ALIAS_TO_PROJECT = [
|
||||||
"release",
|
"release",
|
||||||
{
|
{
|
||||||
"mozilla-release",
|
"mozilla-release",
|
||||||
"comm-esr91",
|
|
||||||
"comm-esr102",
|
"comm-esr102",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
[
|
|
||||||
"esr91",
|
|
||||||
{
|
|
||||||
"mozilla-esr91",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
[
|
[
|
||||||
"esr102",
|
"esr102",
|
||||||
{
|
{
|
||||||
|
|
@ -190,7 +179,6 @@ BALROG_SERVER_SCOPES = {
|
||||||
"aurora": "balrog:server:aurora",
|
"aurora": "balrog:server:aurora",
|
||||||
"beta": "balrog:server:beta",
|
"beta": "balrog:server:beta",
|
||||||
"release": "balrog:server:release",
|
"release": "balrog:server:release",
|
||||||
"esr91": "balrog:server:esr",
|
|
||||||
"esr102": "balrog:server:esr",
|
"esr102": "balrog:server:esr",
|
||||||
"default": "balrog:server:dep",
|
"default": "balrog:server:dep",
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,6 @@ def taskcluster_url(logger, commits):
|
||||||
repos = {
|
repos = {
|
||||||
"mozilla-central": "mozilla-central",
|
"mozilla-central": "mozilla-central",
|
||||||
"integration/autoland": "autoland",
|
"integration/autoland": "autoland",
|
||||||
"releases/mozilla-esr91": "mozilla-esr91",
|
|
||||||
"releases/mozilla-esr102": "mozilla-esr102",
|
"releases/mozilla-esr102": "mozilla-esr102",
|
||||||
}
|
}
|
||||||
cset_url = (
|
cset_url = (
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue