Bug 1606889 - Clean up references to obsolete ESR branches. r=tomprince
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 10 Jan 2020 23:18:50 +0000
changeset 509864 84052ee4136c7d73ed83e2d3134294666b0ad9b2
parent 509863 faddb73036a34c0f0b182017a7ece2dfd9244546
child 509865 13133dc6b4d60c6949c8806032dde7a87514a184
push id37005
push usernerli@mozilla.com
push dateSat, 11 Jan 2020 21:51:30 +0000
treeherdermozilla-central@408f6c0f9814 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstomprince
bugs1606889
milestone74.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1606889 - Clean up references to obsolete ESR branches. r=tomprince Differential Revision: https://phabricator.services.mozilla.com/D58949
taskcluster/ci/build/linux.yml
taskcluster/ci/build/macosx.yml
taskcluster/ci/release-balrog-scheduling/kind.yml
taskcluster/ci/release-balrog-submit-toplevel/kind.yml
taskcluster/ci/release-snap-push/kind.yml
taskcluster/ci/release-update-verify-config/kind.yml
taskcluster/docs/parameters.rst
taskcluster/taskgraph/decision.py
taskcluster/taskgraph/target_tasks.py
taskcluster/taskgraph/util/attributes.py
taskcluster/taskgraph/util/scriptworker.py
testing/mozharness/configs/releases/updates_firefox_esr52.py
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -1264,17 +1264,17 @@ linux64-add-on-devel/opt:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: add-on-devel
         mozconfig-variant: add-on-devel
         tooltool-downloads: public
         need-xvfb: true
-    run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45']
+    run-on-projects: ['mozilla-beta', 'mozilla-release']
     fetches:
         toolchain:
             - linux64-binutils
             - linux64-clang
             - linux64-rust
             - linux64-rust-size
             - linux64-cbindgen
             - linux64-sccache
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -279,17 +279,17 @@ macosx64-add-on-devel/opt:
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_mac_64_cross_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: add-on-devel
         mozconfig-variant: add-on-devel
         tooltool-downloads: internal
-    run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45']
+    run-on-projects: ['mozilla-beta', 'mozilla-release']
     fetches:
         toolchain:
             - linux64-binutils
             - linux64-cctools-port
             - linux64-clang-macosx-cross
             - linux64-hfsplus
             - linux64-libdmg
             - linux64-llvm-dsymutil
--- a/taskcluster/ci/release-balrog-scheduling/kind.yml
+++ b/taskcluster/ci/release-balrog-scheduling/kind.yml
@@ -29,24 +29,22 @@ jobs:
         worker:
             product: firefox
             publish-rules:
                 by-release-level:
                     production:
                         by-release-type:
                             beta: [32]
                             release: [145]
-                            esr60: [806]
                             esr68: [882]
                             default: []
                     staging:
                         by-release-type:
                             beta: [32]
                             release: [145]
-                            esr60: [806]
                             esr68: [875]
                             default: []
             background-rate:
                 by-release-type:
                     beta:
                         by-beta-number:
                             '1': 25
                             '2': 50
@@ -64,23 +62,20 @@ jobs:
             platform: firefox-release/opt
             symbol: Rel(BSFx)
             tier: 1
             kind: build
     firefox-bz2:
         description: Schedule Firefox publishing in balrog (bz2)
         name: release-firefox_schedule_publishing_in_balrog-bz2
         shipping-product: firefox
-        run-on-releases: [esr60, esr68]
+        run-on-releases: [esr68]
         worker:
             product: firefox
-            publish-rules:
-                by-release-type:
-                    esr60: [521]
-                    default: []
+            publish-rules: []
             blob-suffix: -bz2
         treeherder:
             platform: firefox-release/opt
             symbol: Rel(BSFx-bz2)
             tier: 1
             kind: build
     devedition:
         description: Schedule Devedition publishing in balrog
--- a/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
+++ b/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
@@ -41,17 +41,16 @@ jobs:
                     release(-rc)?: ["release", "release-localtest", "release-cdntest"]
                     esr.*: ["esr", "esr-localtest", "esr-cdntest", "esr-localtest-next", "esr-cdntest-next"]
                     default: []
             rules-to-update:
                 by-release-type:
                     beta: ["firefox-beta-cdntest", "firefox-beta-localtest"]
                     release(-rc)?: ["firefox-release-cdntest", "firefox-release-localtest"]
                     esr68: ["firefox-esr68-cdntest", "firefox-esr68-localtest"]
-                    esr60: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
                     default: []
             platforms: ["linux", "linux64", "macosx64", "win32", "win64", "win64-aarch64"]
         treeherder:
             platform: firefox-release/opt
             symbol: Rel(BPFx)
             tier: 1
             kind: build
 
--- a/taskcluster/ci/release-snap-push/kind.yml
+++ b/taskcluster/ci/release-snap-push/kind.yml
@@ -25,17 +25,16 @@ job-defaults:
             production: scriptworker-k8s/gecko-3-pushsnap
             staging: scriptworker-k8s/gecko-1-pushsnap
     worker:
         implementation: push-snap
         channel:
             by-release-type:
                 beta: beta
                 release: candidate
-                esr60: esr/stable
-                esr68: esr/candidate
+                esr68: esr/stable
                 default: mock
 
 jobs:
     firefox:
         shipping-product: firefox
         treeherder:
             symbol: Snap(push)
--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -64,17 +64,16 @@ job-defaults:
                     by-platform:
                         linux-.*: "57.0"
                         linux64-.*: "57.0"
                         macosx64-.*: "57.0"
                         win32-.*: "56.0"
                         win64(?!-aarch64)-.*: "56.0"
                         win64-aarch64.*: "67.0"
                         default: null
-                esr60: "52.0esr"
                 esr68: "68.0esr"
                 default: "default"
 
 jobs:
     firefox-linux:
         shipping-product: firefox
         treeherder:
             symbol: UVC
--- a/taskcluster/docs/parameters.rst
+++ b/taskcluster/docs/parameters.rst
@@ -151,17 +151,17 @@ Release Promotion
 
 ``app_version``
    Specify the application version for release tasks. For releases, this is often a less specific version number than ``version``.
 
 ``next_version``
    Specify the next version for version bump tasks.
 
 ``release_type``
-   The type of release being promoted. One of "nightly", "beta", "esr60", "esr68", "release-rc", or "release".
+   The type of release being promoted. One of "nightly", "beta", "esr68", "release-rc", or "release".
 
 ``release_eta``
    The time and date when a release is scheduled to live. This value is passed to Balrog.
 
 ``release_enable_partners``
    Boolean which controls repacking vanilla Firefox builds for partners.
 
 ``release_partners``
--- a/taskcluster/taskgraph/decision.py
+++ b/taskcluster/taskgraph/decision.py
@@ -74,41 +74,31 @@ PER_PROJECT_PARAMETERS = {
         'release_type': 'beta',
     },
 
     'mozilla-release': {
         'target_tasks_method': 'mozilla_release_tasks',
         'release_type': 'release',
     },
 
-    'mozilla-esr60': {
-        'target_tasks_method': 'mozilla_esr60_tasks',
-        'release_type': 'esr60',
-    },
-
     'mozilla-esr68': {
         'target_tasks_method': 'mozilla_esr68_tasks',
         'release_type': 'esr68',
     },
 
     'comm-central': {
         'target_tasks_method': 'default',
         'release_type': 'nightly',
     },
 
     'comm-beta': {
         'target_tasks_method': 'mozilla_beta_tasks',
         'release_type': 'beta',
     },
 
-    'comm-esr60': {
-        'target_tasks_method': 'mozilla_esr60_tasks',
-        'release_type': 'release',
-    },
-
     'comm-esr68': {
         'target_tasks_method': 'mozilla_esr68_tasks',
         'release_type': 'release',
     },
 
     'pine': {
         'target_tasks_method': 'pine_tasks',
     },
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -227,41 +227,16 @@ def target_tasks_mozilla_release(full_ta
     of desktop, plus android CI. The candidates build process involves a pipeline
     of builds and signing, but does not include beetmover or balrog jobs."""
 
     return [l for l, t in full_task_graph.tasks.iteritems()
             if filter_release_tasks(t, parameters)
             and standard_filter(t, parameters)]
 
 
-@_target_task('mozilla_esr60_tasks')
-def target_tasks_mozilla_esr60(full_task_graph, parameters, graph_config):
-    """Select the set of tasks required for a promotable beta or release build
-    of desktop. 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 esr60.
-        if platform and 'android' in platform:
-            return False
-
-        # All else was already filtered
-        return True
-
-    return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
-
-
 @_target_task('mozilla_esr68_tasks')
 def target_tasks_mozilla_esr68(full_task_graph, parameters, graph_config):
     """Select the set of tasks required for a promotable beta or release build
     of desktop, plus 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):
@@ -720,17 +695,17 @@ def target_tasks_staging_release(full_ta
 def target_tasks_release_simulation(full_task_graph, parameters, graph_config):
     """
     Select builds that would run on push on a release branch.
     """
     project_by_release = {
         'nightly': 'mozilla-central',
         'beta': 'mozilla-beta',
         'release': 'mozilla-release',
-        'esr60': 'mozilla-esr60',
+        'esr68': 'mozilla-esr68',
     }
     target_project = project_by_release.get(parameters['release_type'])
     if target_project is None:
         raise Exception('Unknown or unspecified release type in simulation run.')
 
     def filter_for_target_project(task):
         """Filter tasks by project.  Optionally enable nightlies."""
         run_on_projects = set(task.attributes.get('run_on_projects', []))
--- a/taskcluster/taskgraph/util/attributes.py
+++ b/taskcluster/taskgraph/util/attributes.py
@@ -12,21 +12,19 @@ INTEGRATION_PROJECTS = {
 }
 
 TRUNK_PROJECTS = INTEGRATION_PROJECTS | {'mozilla-central', 'comm-central'}
 
 RELEASE_PROJECTS = {
     'mozilla-central',
     'mozilla-beta',
     'mozilla-release',
-    'mozilla-esr60',
     'mozilla-esr68',
     'comm-central',
     'comm-beta',
-    'comm-esr60',
     'comm-esr68',
     'oak',
 }
 
 RELEASE_PROMOTION_PROJECTS = {
     'jamun',
     'maple',
     'try',
--- a/taskcluster/taskgraph/util/scriptworker.py
+++ b/taskcluster/taskgraph/util/scriptworker.py
@@ -52,20 +52,19 @@ SIGNING_SCOPE_ALIAS_TO_PROJECT = [[
         'mozilla-central',
         'comm-central',
         'oak',
     ])
 ], [
     'all-release-branches', set([
         'mozilla-beta',
         'mozilla-release',
-        'mozilla-esr60',
         'mozilla-esr68',
         'comm-beta',
-        'comm-esr60',
+        'comm-esr68',
     ])
 ]]
 
 """Map the signing scope aliases to the actual scopes.
 """
 SIGNING_CERT_SCOPES = {
     'all-release-branches': 'signing:cert:release-signing',
     'all-nightly-branches': 'signing:cert:nightly-signing',
@@ -90,20 +89,18 @@ BEETMOVER_SCOPE_ALIAS_TO_PROJECT = [[
         'mozilla-central',
         'comm-central',
         'oak',
     ])
 ], [
     'all-release-branches', set([
         'mozilla-beta',
         'mozilla-release',
-        'mozilla-esr60',
         'mozilla-esr68',
         'comm-beta',
-        'comm-esr60',
         'comm-esr68',
     ])
 ]]
 
 """Map the beetmover scope aliases to the actual scopes.
 """
 BEETMOVER_BUCKET_SCOPES = {
     'all-release-branches': 'beetmover:bucket:release',
@@ -136,37 +133,31 @@ BALROG_SCOPE_ALIAS_TO_PROJECT = [[
 ], [
     'beta', set([
         'mozilla-beta',
         'comm-beta',
     ])
 ], [
     'release', set([
         'mozilla-release',
-        'comm-esr60',
         'comm-esr68',
     ])
 ], [
-    'esr60', set([
-        'mozilla-esr60',
-    ])
-], [
     'esr68', set([
         'mozilla-esr68',
     ])
 ]]
 
 """Map the balrog scope aliases to the actual scopes.
 """
 BALROG_SERVER_SCOPES = {
     'nightly': 'balrog:server:nightly',
     'aurora': 'balrog:server:aurora',
     'beta': 'balrog:server:beta',
     'release': 'balrog:server:release',
-    'esr60': 'balrog:server:esr',
     'esr68': 'balrog:server:esr',
     'default': 'balrog:server:dep',
 }
 
 
 PUSH_APK_SCOPE_ALIAS_TO_PROJECT = [[
     'central', set([
         'mozilla-central',
deleted file mode 100644
--- a/testing/mozharness/configs/releases/updates_firefox_esr52.py
+++ /dev/null
@@ -1,35 +0,0 @@
-
-config = {
-    "log_name": "updates_esr52",
-    "repo": {
-        "repo": "https://hg.mozilla.org/build/tools",
-        "branch": "default",
-        "dest": "tools",
-        "vcs": "hg",
-    },
-    "vcs_share_base": "/builds/hg-shared",
-    "push_dest": "ssh://hg.mozilla.org/build/tools",
-    "shipped-locales-url": "https://hg.mozilla.org/releases/mozilla-esr52/raw-file/{revision}/browser/locales/shipped-locales",
-    "ignore_no_changes": True,
-    "ssh_user": "ffxbld",
-    "ssh_key": "~/.ssh/ffxbld_rsa",
-    "archive_domain": "archive.mozilla.org",
-    "archive_prefix": "https://archive.mozilla.org/pub",
-    "previous_archive_prefix": "https://archive.mozilla.org/pub",
-    "download_domain": "download.mozilla.org",
-    "balrog_url": "https://aus5.mozilla.org",
-    "balrog_username": "balrog-ffxbld",
-    "update_channels": {
-        "esr": {
-            "version_regex": r".*",
-            "requires_mirrors": True,
-            "patcher_config": "mozEsr52-branch-patcher2.cfg",
-            "update_verify_channel": "esr-localtest",
-            "mar_channel_ids": [],
-            "channel_names": ["esr", "esr-localtest", "esr-cdntest"],
-            "rules_to_update": ["esr52-cdntest", "esr52-localtest"],
-            "publish_rules": [521],
-        },
-    },
-    "balrog_use_dummy_suffix": False,
-}