Bug 1432737 - No longer strip 'esr' from ship-it version when comparing with esr display version. r=rail
☠☠ backed out by 82ac339f0643 ☠ ☠
authorJustin Wood <Callek@gmail.com>
Wed, 09 May 2018 16:07:38 +0000
changeset 8402 c2297c18a0ff
parent 8401 c9c12ae86e18
child 8403 8a6d5a340f96
push id6132
push userjwood@mozilla.com
push dateWed, 09 May 2018 16:42:36 +0000
reviewersrail
bugs1432737
Bug 1432737 - No longer strip 'esr' from ship-it version when comparing with esr display version. r=rail for: Add the 'esr' string to MOZ_APP_VERSION_DISPLAY Differential Revision: https://phabricator.services.mozilla.com/D1215
lib/python/kickoff/sanity/revisions.py
--- a/lib/python/kickoff/sanity/revisions.py
+++ b/lib/python/kickoff/sanity/revisions.py
@@ -28,18 +28,20 @@ class RevisionsTestSuite(ReleaseSanitize
             result.add_error(err_msg, sys.exc_info())
 
     def test_versions_display_validation_in_tree(self, result):
         """test_versions method
         Tests if the upstream display version exists and if it is the same
         with the current one coming from release runner
         """
         log.info("Testing version display validation in tree ...")
-        # esr-hack: ensure trimming the suffix before comparing
-        version = self.version.replace("esr", "")
+        version = self.version
+        if '52.' in version:
+            # esr-hack: ensure trimming the suffix before comparing, for < esr60
+            version = self.version.replace("esr", "")
 
         try:
             display_version = make_hg_get_request(self.repo_path, self.revision,
                                                   filename=VERSION_DISPLAY_CONFIG_URI).strip()
         except requests.HTTPError as err:
             err_msg = ("display_version config file not found in {path} under"
                        " {rev} revision. URL: {url}").format(
                            path=self.repo_path,