diff --git a/.cron.yml b/.cron.yml index bc671fccb083..32f3044e877e 100644 --- a/.cron.yml +++ b/.cron.yml @@ -131,7 +131,6 @@ jobs: run-on-projects: - mozilla-beta - mozilla-release - - mozilla-esr102 - mozilla-esr115 - elm # For all non m-c jobs we just run once daily matching the 10 UTC @@ -231,7 +230,6 @@ jobs: - mozilla-central - mozilla-beta - mozilla-release - - mozilla-esr102 - mozilla-esr115 when: - {weekday: 'Monday', hour: 8, minute: 0} diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/artifacts.py index b794ecdc500c..0051f5e84f45 100644 --- a/python/mozbuild/mozbuild/artifacts.py +++ b/python/mozbuild/mozbuild/artifacts.py @@ -100,7 +100,6 @@ class ArtifactJob(object): ] # The list below list should be updated when we have new ESRs. esr_candidate_trees = [ - "releases/mozilla-esr102", "releases/mozilla-esr115", ] try_tree = "try" @@ -842,7 +841,6 @@ class ThunderbirdMixin(object): ] # The list below list should be updated when we have new ESRs. esr_candidate_trees = [ - "releases/comm-esr102", "releases/comm-esr115", ] diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml index e70f7cdafb29..2ea57e168f88 100644 --- a/taskcluster/ci/build/linux.yml +++ b/taskcluster/ci/build/linux.yml @@ -500,7 +500,6 @@ linux/opt: run-on-projects: - 'mozilla-beta' - 'mozilla-release' - - 'mozilla-esr102' - 'mozilla-esr115' use-sccache: true fetches: diff --git a/taskcluster/ci/build/windows-mingw.yml b/taskcluster/ci/build/windows-mingw.yml index 4927499e1fa6..be133f50bac3 100644 --- a/taskcluster/ci/build/windows-mingw.yml +++ b/taskcluster/ci/build/windows-mingw.yml @@ -34,7 +34,6 @@ win32-mingwclang/opt: mozconfig-variant: mingwclang run-on-projects: - 'mozilla-central' - - 'mozilla-esr102' - 'mozilla-esr115' use-sccache: true fetches: @@ -74,7 +73,6 @@ win32-mingwclang/debug: mozconfig-variant: mingwclang-debug run-on-projects: - 'mozilla-central' - - 'mozilla-esr102' - 'mozilla-esr115' use-sccache: true fetches: @@ -114,7 +112,6 @@ win64-mingwclang/opt: mozconfig-variant: mingwclang run-on-projects: - 'mozilla-central' - - 'mozilla-esr102' - 'mozilla-esr115' use-sccache: true fetches: @@ -154,7 +151,6 @@ win64-mingwclang/debug: mozconfig-variant: mingwclang-debug run-on-projects: - 'mozilla-central' - - 'mozilla-esr102' - 'mozilla-esr115' use-sccache: true fetches: diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml index 9bfffb016c4e..1fc54b124b9b 100644 --- a/taskcluster/ci/config.yml +++ b/taskcluster/ci/config.yml @@ -408,19 +408,6 @@ merge-automation: end-tag: 'FIREFOX_NIGHTLY_{major_version}_END' to-repo: 'https://hg.mozilla.org/mozilla-central' to-branch: 'central' - 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' bump-esr115: fetch-version-from: "browser/config/version.txt" version-files: diff --git a/taskcluster/ci/release-balrog-scheduling/kind.yml b/taskcluster/ci/release-balrog-scheduling/kind.yml index 2533818ca26c..64bd751ca319 100644 --- a/taskcluster/ci/release-balrog-scheduling/kind.yml +++ b/taskcluster/ci/release-balrog-scheduling/kind.yml @@ -34,14 +34,12 @@ jobs: by-release-type: beta: [32] release: [145] - esr102: [17770] esr115: [17824] default: [] staging: by-release-type: beta: [32] release: [145] - esr102: [902] esr115: [909] default: [] background-rate: diff --git a/taskcluster/ci/release-balrog-submit-toplevel/kind.yml b/taskcluster/ci/release-balrog-submit-toplevel/kind.yml index b8997e90d23b..dc1155df9d56 100644 --- a/taskcluster/ci/release-balrog-submit-toplevel/kind.yml +++ b/taskcluster/ci/release-balrog-submit-toplevel/kind.yml @@ -46,7 +46,6 @@ jobs: by-release-type: beta: ["firefox-beta-cdntest", "firefox-beta-localtest"] release(-rc)?: ["firefox-release-cdntest", "firefox-release-localtest"] - esr102: ["firefox-esr102-cdntest", "firefox-esr102-localtest"] esr115: ["firefox-esr115-cdntest", "firefox-esr115-localtest"] default: [] pin-channels: diff --git a/taskcluster/docs/attributes.rst b/taskcluster/docs/attributes.rst index ba5e2381d833..5d187c2e9a1a 100644 --- a/taskcluster/docs/attributes.rst +++ b/taskcluster/docs/attributes.rst @@ -45,7 +45,7 @@ Project names are the repositories. They can be: * `mozilla-central` * `mozilla-beta` * `mozilla-release` -* `mozilla-esr102` +* `mozilla-esr115` * ... 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 diff --git a/taskcluster/docs/parameters.rst b/taskcluster/docs/parameters.rst index 0e0bc9cb3e18..cb80b2280209 100644 --- a/taskcluster/docs/parameters.rst +++ b/taskcluster/docs/parameters.rst @@ -197,7 +197,7 @@ Release Promotion Specify the next version for version bump tasks. ``release_type`` - The type of release being promoted. One of "nightly", "beta", "esr102", "esr115", "release-rc", or "release". + The type of release being promoted. One of "nightly", "beta", "esr115", "release-rc", or "release". ``release_eta`` The time and date when a release is scheduled to live. This value is passed to Balrog. diff --git a/taskcluster/gecko_taskgraph/decision.py b/taskcluster/gecko_taskgraph/decision.py index 4fa05afe27f1..1e9f6999354f 100644 --- a/taskcluster/gecko_taskgraph/decision.py +++ b/taskcluster/gecko_taskgraph/decision.py @@ -92,10 +92,6 @@ PER_PROJECT_PARAMETERS = { "target_tasks_method": "mozilla_release_tasks", "release_type": "release", }, - "mozilla-esr102": { - "target_tasks_method": "mozilla_esr102_tasks", - "release_type": "esr102", - }, "mozilla-esr115": { "target_tasks_method": "mozilla_esr115_tasks", "release_type": "esr115", diff --git a/taskcluster/gecko_taskgraph/target_tasks.py b/taskcluster/gecko_taskgraph/target_tasks.py index 08b4e4e4ddce..b5e83d928cb0 100644 --- a/taskcluster/gecko_taskgraph/target_tasks.py +++ b/taskcluster/gecko_taskgraph/target_tasks.py @@ -534,30 +534,6 @@ def target_tasks_mozilla_release(full_task_graph, parameters, graph_config): ] -@_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("mozilla_esr115_tasks") def target_tasks_mozilla_esr115(full_task_graph, parameters, graph_config): """Select the set of tasks required for a promotable beta or release build @@ -1168,7 +1144,6 @@ def target_tasks_release_simulation(full_task_graph, parameters, graph_config): "nightly": "mozilla-central", "beta": "mozilla-beta", "release": "mozilla-release", - "esr102": "mozilla-esr102", "esr115": "mozilla-esr115", } target_project = project_by_release.get(parameters["release_type"]) diff --git a/taskcluster/gecko_taskgraph/transforms/update_verify_config.py b/taskcluster/gecko_taskgraph/transforms/update_verify_config.py index 1de808f82ba1..2d1cd40877b6 100644 --- a/taskcluster/gecko_taskgraph/transforms/update_verify_config.py +++ b/taskcluster/gecko_taskgraph/transforms/update_verify_config.py @@ -27,7 +27,7 @@ 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 esr102 + # Previous esr versions, for update testing before we update users to esr115 "esr115-next": r"'^(52|60|68|78|91|102)+\.\d+(\.\d+)?esr$'", } diff --git a/taskcluster/gecko_taskgraph/util/attributes.py b/taskcluster/gecko_taskgraph/util/attributes.py index 7aac3448de4f..9971ff233ee7 100644 --- a/taskcluster/gecko_taskgraph/util/attributes.py +++ b/taskcluster/gecko_taskgraph/util/attributes.py @@ -15,11 +15,9 @@ RELEASE_PROJECTS = { "mozilla-central", "mozilla-beta", "mozilla-release", - "mozilla-esr102", "mozilla-esr115", "comm-central", "comm-beta", - "comm-esr102", "comm-esr115", # bug 1845368: pine is a permanent project branch used for testing # nightly updates diff --git a/taskcluster/gecko_taskgraph/util/scriptworker.py b/taskcluster/gecko_taskgraph/util/scriptworker.py index ca07e0926c37..28c0537174da 100644 --- a/taskcluster/gecko_taskgraph/util/scriptworker.py +++ b/taskcluster/gecko_taskgraph/util/scriptworker.py @@ -61,10 +61,8 @@ SIGNING_SCOPE_ALIAS_TO_PROJECT = [ { "mozilla-beta", "mozilla-release", - "mozilla-esr102", "mozilla-esr115", "comm-beta", - "comm-esr102", "comm-esr115", }, ], @@ -110,10 +108,8 @@ BEETMOVER_SCOPE_ALIAS_TO_PROJECT = [ { "mozilla-beta", "mozilla-release", - "mozilla-esr102", "mozilla-esr115", "comm-beta", - "comm-esr102", "comm-esr115", }, ], @@ -188,16 +184,9 @@ BALROG_SCOPE_ALIAS_TO_PROJECT = [ "release", { "mozilla-release", - "comm-esr102", "comm-esr115", }, ], - [ - "esr102", - { - "mozilla-esr102", - }, - ], [ "esr115", { @@ -213,7 +202,6 @@ BALROG_SERVER_SCOPES = { "aurora": "balrog:server:aurora", "beta": "balrog:server:beta", "release": "balrog:server:release", - "esr102": "balrog:server:esr", "esr115": "balrog:server:esr", "default": "balrog:server:dep", } diff --git a/testing/web-platform/manifestdownload.py b/testing/web-platform/manifestdownload.py index 8f178061bb57..a94b2f31b46e 100644 --- a/testing/web-platform/manifestdownload.py +++ b/testing/web-platform/manifestdownload.py @@ -91,7 +91,6 @@ def taskcluster_url(logger, commits): repos = { "mozilla-central": "mozilla-central", "integration/autoland": "autoland", - "releases/mozilla-esr102": "mozilla-esr102", "releases/mozilla-esr115": "mozilla-esr115", } cset_url = (