Bug 1265425 - Split partner repacks into smaller chunks r=rail a=release DONTBUILD
authorChris Cooper <coop@mozilla.com>
Tue, 03 May 2016 12:42:29 -0400
changeset 332663 705d7c9e1021043be77aa1c8a15b3db291298882
parent 332662 fdf6664b4ed7b2bc3cb5bbb4037fab9c71162358
child 332664 43fd203f3c5ff3b73971eb08c2fda54141e350a0
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)
reviewersrail, release
bugs1265425
milestone48.0a2
Bug 1265425 - Split partner repacks into smaller chunks r=rail a=release DONTBUILD MozReview-Commit-ID: 4z1WcbEX7OT
testing/mozharness/scripts/desktop_partner_repacks.py
--- a/testing/mozharness/scripts/desktop_partner_repacks.py
+++ b/testing/mozharness/scripts/desktop_partner_repacks.py
@@ -93,45 +93,38 @@ class DesktopPartnerRepacks(ReleaseMixin
         #
 
         BaseScript.__init__(
             self,
             config_options=self.config_options,
             **buildscript_kwargs
         )
 
-        if 'repo_file' not in self.config:
-            self.fatal("repo_file not supplied.")
-        if 'repack_manifests_url' not in self.config:
-            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', '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', {})
-            partner = buildbot_props.get('partner')
-            if not partner:
-                self.fatal("No partner specified in buildprops.json.")
-            self.config['partner'] = partner
+            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'))
+            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 '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:
+            self.fatal("repack_manifests_url not supplied.")
 
     def query_abs_dirs(self):
         if self.abs_dirs:
             return self.abs_dirs
         abs_dirs = super(DesktopPartnerRepacks, self).query_abs_dirs()
         for directory in abs_dirs:
             value = abs_dirs[directory]
             abs_dirs[directory] = value