Bug 1260415 - Use revision as tag r=coop a=release DONTBUILD draft
authorRail Aliiev <rail@mozilla.com>
Fri, 15 Apr 2016 23:14:48 -0400
changeset 352701 4e9083e7a360adb1b7b5e20a62c8d7bbd4b70205
parent 352700 755eb5d58f6f3ee4e41f9844e4491aa2bbd8e9a1
child 518699 e7e566d6cab9ce8bd34c013ef6331552f97de808
push id15746
push userbmo:rail@mozilla.com
push dateMon, 18 Apr 2016 13:17:47 +0000
reviewerscoop, release
bugs1260415
milestone48.0a1
Bug 1260415 - Use revision as tag r=coop a=release DONTBUILD MozReview-Commit-ID: 3cZe5ieNndK
testing/mozharness/scripts/desktop_partner_repacks.py
--- a/testing/mozharness/scripts/desktop_partner_repacks.py
+++ b/testing/mozharness/scripts/desktop_partner_repacks.py
@@ -104,17 +104,17 @@ class DesktopPartnerRepacks(ReleaseMixin
             self.fatal("repack_manifests_url not supplied.")
 
     def _pre_config_lock(self, rw_config):
         self.read_buildbot_config()
         if not self.buildbot_config:
             self.warning("Skipping buildbot properties overrides")
         else:
             props = self.buildbot_config["properties"]
-            for prop in ['version', 'build_number']:
+            for prop in ['version', 'build_number', 'revision']:
                 if props.get(prop):
                     self.info("Overriding %s with %s" % (prop, props[prop]))
                     self.config[prop] = props.get(prop)
 
         if self.config.get('require_buildprops', False) is True:
             if not self.buildbot_config:
                 self.fatal("Unable to load properties from file: %s" % self.config.get('buildbot_json_path'))
             buildbot_props = self.buildbot_config.get('properties', {})
@@ -187,16 +187,18 @@ class DesktopPartnerRepacks(ReleaseMixin
         if self.config.get('partner'):
             repack_cmd.extend(["--partner", self.config['partner']])
         if self.config.get('s3cfg'):
             repack_cmd.extend(["--s3cfg", self.config['s3cfg']])
         if self.config.get('hgroot'):
             repack_cmd.extend(["--hgroot", self.config['hgroot']])
         if self.config.get('hgrepo'):
             repack_cmd.extend(["--repo", self.config['hgrepo']])
+        if self.config.get('revision'):
+            repack_cmd.extend(["--tag", self.config["revision"]])
 
         return self.run_command(repack_cmd,
                                 cwd=self.query_abs_dirs()['abs_scripts_dir'])
 
 # main {{{
 if __name__ == '__main__':
     partner_repacks = DesktopPartnerRepacks()
     partner_repacks.run_and_exit()