Backed out changeset c2297c18a0ff, Bug 1432737 - No longer strip 'esr' from ship-it version when comparing with esr display version, r=backout THUNDERBIRD_52_8_0_BUILD1 THUNDERBIRD_52_8_0_RELEASE
authorJordan Lund <jlund@mozilla.com>
Tue, 15 May 2018 18:03:40 -0700
changeset 8406 82ac339f0643eeae08c477a518e72cad5d21bc81
parent 8405 e69021feb46852b77108d216ee70b09600b1b0d5
child 8407 1016b124ae26554f43a839a13fa16ffc77767841
push id6136
push userjlund@mozilla.com
push dateWed, 16 May 2018 01:07:23 +0000
reviewersbackout
bugs1432737
backs outc2297c18a0ff4888ced954f76c3984c134406066
Backed out changeset c2297c18a0ff, Bug 1432737 - No longer strip 'esr' from ship-it version when comparing with esr display version, r=backout
lib/python/kickoff/sanity/revisions.py
--- a/lib/python/kickoff/sanity/revisions.py
+++ b/lib/python/kickoff/sanity/revisions.py
@@ -28,20 +28,18 @@ 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 ...")
-        version = self.version
-        if '52.' in version:
-            # esr-hack: ensure trimming the suffix before comparing, for < esr60
-            version = self.version.replace("esr", "")
+        # esr-hack: ensure trimming the suffix before comparing
+        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,