Bug 1276312 - Adjust validate_version() for esr r=jlund
authorRail Aliiev <rail@mozilla.com>
Fri, 27 May 2016 15:06:20 -0400
changeset 6821 e1069ff2842daf08623403047b5b4e531863c81f
parent 6820 987f8ba6ff38b16bf75af161df55cdfd33405d80
child 6822 84f0ec18e1440e84e9f2371766c40f6723f2617b
push id5090
push userraliiev@mozilla.com
push dateFri, 27 May 2016 19:08:35 +0000
reviewersjlund
bugs1276312
Bug 1276312 - Adjust validate_version() for esr r=jlund
buildfarm/release/release-runner.py
--- a/buildfarm/release/release-runner.py
+++ b/buildfarm/release/release-runner.py
@@ -246,18 +246,20 @@ def get_hash(path, hash_type="sha512"):
     h = hashlib.new(hash_type)
     with open(path, "rb") as f:
         for chunk in iter(functools.partial(f.read, 4096), ''):
             h.update(chunk)
     return h.hexdigest()
 
 
 def validate_graph_kwargs(queue, gpg_key_path, **kwargs):
+    # We don't export "esr" in the version
     validate_version(repo_path=kwargs["repo_path"],
-                     revision=kwargs["revision"], version=kwargs["version"])
+                     revision=kwargs["revision"],
+                     version=kwargs["version"].replace("esr", ""))
     # TODO: validate partials
     # TODO: validate l10n changesets
     platforms = kwargs.get('en_US_config', {}).get('platforms', {})
     for platform in platforms.keys():
         task_id = platforms.get(platform).get('task_id', {})
         log.info('Performing release sanity for %s en-US binary', platform)
         sanitize_en_US_binary(queue, task_id, gpg_key_path)