Bug 1432737 - No longer strip 'esr' from ship-it version when comparing with esr display version. r=rail
authorJustin Wood <Callek@gmail.com>
Wed, 09 May 2018 16:07:38 +0000
changeset 8425 316bb57741ab
parent 8424 54446ea4e817
child 8426 50b6a03f2965
push id6152
push userCallek@gmail.com
push date2018-06-13 21:01 +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
@@ -34,18 +34,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[self.product],
             ).strip()
         except requests.HTTPError as err:
             err_msg = ("display_version config file not found in {path} under"