Bug 1462120 - Update verify fixes for ESR60 branch, r=bhearsum DONTBUILD

taskcluster/ci/release-update-verify-config/kind.yml

@@ -58,6 +58,7 @@ job-defaults:
             maple: beta
             mozilla-beta: beta
             mozilla-release: nonbeta
+            mozilla-esr60: esr
             default: null
       last-watershed:
          by-project:
@@ -112,6 +113,7 @@ jobs:
                mozilla-beta: "beta-localtest"
                mozilla-release: "release-localtest"
                mozilla-esr52: "esr-localtest"
+               mozilla-esr60: "esr-localtest"
                default: "default"
          mar-channel-id-override:
             by-project:
@@ -140,6 +142,7 @@ jobs:
                mozilla-beta: "beta-localtest"
                mozilla-release: "release-localtest"
                mozilla-esr52: "esr-localtest"
+               mozilla-esr60: "esr-localtest"
                default: "default"
          mar-channel-id-override:
             by-project:
@@ -168,6 +171,7 @@ jobs:
                mozilla-beta: "beta-localtest"
                mozilla-release: "release-localtest"
                mozilla-esr52: "esr-localtest"
+               mozilla-esr60: "esr-localtest"
                default: "default"
          mar-channel-id-override:
             by-project:
@@ -196,6 +200,7 @@ jobs:
                mozilla-beta: "beta-localtest"
                mozilla-release: "release-localtest"
                mozilla-esr52: "esr-localtest"
+               mozilla-esr60: "esr-localtest"
                default: "default"
          mar-channel-id-override:
             by-project:
@@ -224,6 +229,7 @@ jobs:
                mozilla-beta: "beta-localtest"
                mozilla-release: "release-localtest"
                mozilla-esr52: "esr-localtest"
+               mozilla-esr60: "esr-localtest"
                default: "default"
          mar-channel-id-override:
             by-project:

taskcluster/ci/release-update-verify/kind.yml

@@ -56,6 +56,7 @@ jobs:
                   maple: "beta-localtest"
                   mozilla-beta: "beta-localtest"
                   mozilla-release: "release-localtest"
+                  mozilla-esr60: "esr-localtest"
                   default: "default"
       treeherder:
          symbol: UV(UV)
@@ -77,6 +78,7 @@ jobs:
                   maple: "beta-localtest"
                   mozilla-beta: "beta-localtest"
                   mozilla-release: "release-localtest"
+                  mozilla-esr60: "esr-localtest"
                   default: "default"
       treeherder:
          symbol: UV(UV)
@@ -98,6 +100,7 @@ jobs:
                   maple: "beta-localtest"
                   mozilla-beta: "beta-localtest"
                   mozilla-release: "release-localtest"
+                  mozilla-esr60: "esr-localtest"
                   default: "default"
       treeherder:
          symbol: UV(UV)
@@ -119,6 +122,7 @@ jobs:
                   maple: "beta-localtest"
                   mozilla-beta: "beta-localtest"
                   mozilla-release: "release-localtest"
+                  mozilla-esr60: "esr-localtest"
                   default: "default"
       treeherder:
          symbol: UV(UV)
@@ -140,6 +144,7 @@ jobs:
                   maple: "beta-localtest"
                   mozilla-beta: "beta-localtest"
                   mozilla-release: "release-localtest"
+                  mozilla-esr60: "esr-localtest"
                   default: "default"
       treeherder:
          symbol: UV(UV)

taskcluster/taskgraph/transforms/update_verify_config.py

@@ -24,13 +24,15 @@ transforms = TransformSequence()
 # In the rare event that we do ship a point
 # release to beta, we need to either:
 # 1) update these regexes to match that specific version
-# 2) pass a second include version that matches that specifivc version
+# 2) pass a second include version that matches that specific version
 INCLUDE_VERSION_REGEXES = {
     "beta": r"'^(\d+\.\d+(b\d+)?)$'",
     "nonbeta": r"'^\d+\.\d+(\.\d+)?$'",
     # Same as beta, except excludes 58.0b1 due to issues with it not being able
     # to update to latest
     "devedition_hack": r"'^((?!58\.0b1$)\d+\.\d+(b\d+)?)$'",
+    # Same as nonbeta, except for the esr suffix
+    "esr": r"'^\d+\.\d+(\.\d+)?esr$'",
 }
 
 MAR_CHANNEL_ID_OVERRIDE_REGEXES = {

testing/mozharness/scripts/release/update-verify-config-creator.py

@@ -216,7 +216,6 @@ class UpdateVerifyConfigCreator(BaseScript):
         releases = json.load(ret)["releases"]
         for release_name, release_info in reversed(sorted(releases.items())):
             product, version = release_name.split("-", 1)
-            version = version.rstrip("esr")
             tag = "{}_{}_RELEASE".format(product.upper(), version.replace(".", "_"))
             # Product details has a "category" for releases that we can use to
             # determine the repo path. This will fail if any previous releases