Bug 1250629 - desktop l10n script should accept a packageUrl property which points to en-US build, r?catlee draft
authorNick Thomas <nthomas@mozilla.com>
Tue, 17 May 2016 16:51:45 +1200
changeset 367652 8063ba7c7a649a718e5cc1687f40b2766a6bd593
parent 367573 a884b96685aa13b65601feddb24e5f85ba861561
child 521069 9f2db11fdadfe4115a58988ab37798c77c5402c8
push id18307
push usernthomas@mozilla.com
push dateTue, 17 May 2016 04:52:41 +0000
reviewerscatlee
bugs1250629
milestone49.0a1
Bug 1250629 - desktop l10n script should accept a packageUrl property which points to en-US build, r?catlee MozReview-Commit-ID: KiRSNsrlOJs
testing/mozharness/scripts/desktop_l10n.py
--- a/testing/mozharness/scripts/desktop_l10n.py
+++ b/testing/mozharness/scripts/desktop_l10n.py
@@ -351,18 +351,26 @@ class DesktopSingleLocale(LocalesMixin, 
     def query_bootstrap_env(self):
         """returns the env for repacks"""
         if self.bootstrap_env:
             return self.bootstrap_env
         config = self.config
         replace_dict = self.query_abs_dirs()
 
         replace_dict['en_us_binary_url'] = config.get('en_us_binary_url')
+        self.read_buildbot_config()
+        # Override en_us_binary_url if packageUrl is passed as a property from
+        # the en-US build
+        if self.buildbot_config["properties"].get("packageUrl"):
+            packageUrl = self.buildbot_config["properties"]["packageUrl"]
+            # trim off the filename, the build system wants a directory
+            packageUrl = packageUrl.rsplit('/', 1)[0]
+            self.info("Overriding en_us_binary_url with %s" % packageUrl)
+            replace_dict['en_us_binary_url'] = packageUrl
         # Override en_us_binary_url if passed as a buildbot property
-        self.read_buildbot_config()
         if self.buildbot_config["properties"].get("en_us_binary_url"):
             self.info("Overriding en_us_binary_url with %s" %
                       self.buildbot_config["properties"]["en_us_binary_url"])
             replace_dict['en_us_binary_url'] = \
                 str(self.buildbot_config["properties"]["en_us_binary_url"])
         bootstrap_env = self.query_env(partial_env=config.get("bootstrap_env"),
                                        replace_dict=replace_dict)
         if 'MOZ_SIGNING_SERVERS' in os.environ: