Bug 1462120 - Update verify fixes for ESR60 branch, r=bhearsum a=release DONTBUILD
authorNick Thomas <nthomas@mozilla.com>
Wed, 30 May 2018 11:29:09 +1200
changeset 463637 13fdf7dee914
parent 463636 2b504eb4567d
child 463638 e7ba266cc17b
push id1723
push usernthomas@mozilla.com
push dateTue, 29 May 2018 23:39:51 +0000
treeherdermozilla-release@13fdf7dee914 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbhearsum, release
bugs1462120
milestone60.0.2
Bug 1462120 - Update verify fixes for ESR60 branch, r=bhearsum a=release DONTBUILD
taskcluster/ci/release-update-verify-config/kind.yml
taskcluster/ci/release-update-verify/kind.yml
taskcluster/taskgraph/transforms/update_verify_config.py
testing/mozharness/scripts/release/update-verify-config-creator.py
--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -52,17 +52,17 @@ job-defaults:
       # is behind a watershed
       include-version:
          by-project:
             birch: nonbeta
             jamun: nonbeta
             maple: beta
             mozilla-beta: beta
             mozilla-release: nonbeta
-            mozilla-esr60: nonbeta
+            mozilla-esr60: esr
             default: null
       last-watershed:
          by-project:
             birch:
                by-build-platform:
                   linux: "57.0"
                   linux64: "57.0"
                   macosx64: "57.0"
@@ -107,16 +107,17 @@ jobs:
          channel:
             by-project:
                birch: "release-localtest"
                jamun: "beta-localtest"
                maple: "beta-localtest"
                mozilla-beta: "beta-localtest"
                mozilla-release: "release-localtest"
                mozilla-esr52: "esr-localtest"
+               mozilla-esr60: "esr-localtest"
                default: "default"
          mar-channel-id-override:
             by-project:
                maple: beta
                mozilla-beta: beta
                default: null
 
    firefox-linux64:
@@ -135,16 +136,17 @@ jobs:
          channel:
             by-project:
                birch: "release-localtest"
                jamun: "beta-localtest"
                maple: "beta-localtest"
                mozilla-beta: "beta-localtest"
                mozilla-release: "release-localtest"
                mozilla-esr52: "esr-localtest"
+               mozilla-esr60: "esr-localtest"
                default: "default"
          mar-channel-id-override:
             by-project:
                maple: beta
                mozilla-beta: beta
                default: null
 
    firefox-macosx64:
@@ -163,16 +165,17 @@ jobs:
          channel:
             by-project:
                birch: "release-localtest"
                jamun: "beta-localtest"
                maple: "beta-localtest"
                mozilla-beta: "beta-localtest"
                mozilla-release: "release-localtest"
                mozilla-esr52: "esr-localtest"
+               mozilla-esr60: "esr-localtest"
                default: "default"
          mar-channel-id-override:
             by-project:
                maple: beta
                mozilla-beta: beta
                default: null
 
    firefox-win32:
@@ -191,16 +194,17 @@ jobs:
          channel:
             by-project:
                birch: "release-localtest"
                jamun: "beta-localtest"
                maple: "beta-localtest"
                mozilla-beta: "beta-localtest"
                mozilla-release: "release-localtest"
                mozilla-esr52: "esr-localtest"
+               mozilla-esr60: "esr-localtest"
                default: "default"
          mar-channel-id-override:
             by-project:
                maple: beta
                mozilla-beta: beta
                default: null
 
    firefox-win64:
@@ -219,16 +223,17 @@ jobs:
          channel:
             by-project:
                birch: "release-localtest"
                jamun: "beta-localtest"
                maple: "beta-localtest"
                mozilla-beta: "beta-localtest"
                mozilla-release: "release-localtest"
                mozilla-esr52: "esr-localtest"
+               mozilla-esr60: "esr-localtest"
                default: "default"
          mar-channel-id-override:
             by-project:
                maple: beta
                mozilla-beta: beta
                default: null
 
    devedition-linux:
--- a/taskcluster/ci/release-update-verify/kind.yml
+++ b/taskcluster/ci/release-update-verify/kind.yml
@@ -51,16 +51,17 @@ jobs:
          env:
             CHANNEL:
                by-project:
                   birch: "release-localtest"
                   jamun: "beta-localtest"
                   maple: "beta-localtest"
                   mozilla-beta: "beta-localtest"
                   mozilla-release: "release-localtest"
+                  mozilla-esr60: "esr-localtest"
                   default: "default"
       treeherder:
          symbol: UV
          platform: linux64/opt
          kind: test
          tier: 1
       attributes:
          build_platform: linux64
@@ -72,16 +73,17 @@ jobs:
          env:
             CHANNEL:
                by-project:
                   birch: "release-localtest"
                   jamun: "beta-localtest"
                   maple: "beta-localtest"
                   mozilla-beta: "beta-localtest"
                   mozilla-release: "release-localtest"
+                  mozilla-esr60: "esr-localtest"
                   default: "default"
       treeherder:
          symbol: UV
          platform: linux/opt
          kind: test
          tier: 1
       attributes:
          build_platform: linux
@@ -93,16 +95,17 @@ jobs:
          env:
             CHANNEL:
                by-project:
                   birch: "release-localtest"
                   jamun: "beta-localtest"
                   maple: "beta-localtest"
                   mozilla-beta: "beta-localtest"
                   mozilla-release: "release-localtest"
+                  mozilla-esr60: "esr-localtest"
                   default: "default"
       treeherder:
          symbol: UV
          platform: win64/opt
          kind: test
          tier: 1
       attributes:
          build_platform: win64
@@ -114,16 +117,17 @@ jobs:
          env:
             CHANNEL:
                by-project:
                   birch: "release-localtest"
                   jamun: "beta-localtest"
                   maple: "beta-localtest"
                   mozilla-beta: "beta-localtest"
                   mozilla-release: "release-localtest"
+                  mozilla-esr60: "esr-localtest"
                   default: "default"
       treeherder:
          symbol: UV
          platform: win32/opt
          kind: test
          tier: 1
       attributes:
          build_platform: win32
@@ -135,16 +139,17 @@ jobs:
          env:
             CHANNEL:
                by-project:
                   birch: "release-localtest"
                   jamun: "beta-localtest"
                   maple: "beta-localtest"
                   mozilla-beta: "beta-localtest"
                   mozilla-release: "release-localtest"
+                  mozilla-esr60: "esr-localtest"
                   default: "default"
       treeherder:
          symbol: UV
          platform: macosx64/opt
          kind: test
          tier: 1
       attributes:
          build_platform: macosx64
--- a/taskcluster/taskgraph/transforms/update_verify_config.py
+++ b/taskcluster/taskgraph/transforms/update_verify_config.py
@@ -15,23 +15,25 @@ from taskgraph.util.scriptworker import 
 
 transforms = TransformSequence()
 
 
 # The beta regexes do not match point releases.
 # 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 = {
     "beta": r"'^\d+\.\d+(\.\d+)?$$,firefox-mozilla-beta,firefox-mozilla-release'",
 }
 
 
 @transforms.add
--- a/testing/mozharness/scripts/release/update-verify-config-creator.py
+++ b/testing/mozharness/scripts/release/update-verify-config-creator.py
@@ -206,17 +206,16 @@ class UpdateVerifyConfigCreator(BaseScri
                 self.config["product_details_server"],
                 self.config["stage_product"],
             ),
             "WARNING",
         )
         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
             # were built from a project branch - but that's not something we do
             # at the time of writing.
             branch = None
             if release_info["category"] == "dev":
                 branch = "releases/mozilla-beta"