Bug 1265425 - Fix buildbot properties r=coop a=release DONTBUILD
authorRail Aliiev <rail@mozilla.com>
Fri, 06 May 2016 07:01:30 -0400
changeset 332745 b3e8b9ecb15741f046df04d395987084ba87cb13
parent 332744 b61ad3a6049cbcfe4945897e94b8d7ce5beb5c5f
child 332746 b503bcc0c6efe2b0d1182191833e17de7f9a63e3
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscoop, release
bugs1265425
milestone48.0a2
Bug 1265425 - Fix buildbot properties r=coop a=release DONTBUILD MozReview-Commit-ID: DBWsXeSuobI
testing/mozharness/scripts/desktop_partner_repacks.py
--- a/testing/mozharness/scripts/desktop_partner_repacks.py
+++ b/testing/mozharness/scripts/desktop_partner_repacks.py
@@ -102,20 +102,21 @@ class DesktopPartnerRepacks(ReleaseMixin
     def _pre_config_lock(self, rw_config):
         self.read_buildbot_config()
         if not self.buildbot_config:
             self.warning("Skipping buildbot properties overrides")
         else:
             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'))
+            props = self.buildbot_config["properties"]
             for prop in ['version', 'build_number', 'revision', 'repo_file', 'repack_manifests_url', 'partner']:
-                if self.buildbot_config.get(prop):
-                    self.info("Overriding %s with %s" % (prop, self.buildbot_config[prop]))
-                    self.config[prop] = self.buildbot_config.get(prop)
+                if props.get(prop):
+                    self.info("Overriding %s with %s" % (prop, props[prop]))
+                    self.config[prop] = props.get(prop)
 
         if 'version' not in self.config:
             self.fatal("Version (-v) not supplied.")
         if 'build_number' not in self.config:
             self.fatal("Build number (-n) not supplied.")
         if 'repo_file' not in self.config:
             self.fatal("repo_file not supplied.")
         if 'repack_manifests_url' not in self.config: