Bug 1201383 - Android l10n jobs fail to push new release to test channels, r=rail
authorNick Thomas <nthomas@mozilla.com>
Thu, 08 Oct 2015 22:48:37 +1300
changeset 266856 024f11388f994f77bfdd64b4d09df82772c6c53f
parent 266855 3cb22083aaf02e2366d7e4aaa20c81e919564435
child 266857 9fa59a2303d81d9dc3b951321b7af118b1daa1e4
push id29499
push userkwierso@gmail.com
push dateThu, 08 Oct 2015 21:29:10 +0000
treeherdermozilla-central@46da59584acb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrail
bugs1201383
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1201383 - Android l10n jobs fail to push new release to test channels, r=rail
testing/mozharness/mozharness/mozilla/release.py
testing/mozharness/mozharness/mozilla/updates/balrog.py
--- a/testing/mozharness/mozharness/mozilla/release.py
+++ b/testing/mozharness/mozharness/mozilla/release.py
@@ -35,15 +35,16 @@ class ReleaseMixin():
                 self.fatal("Release config file %s not found!" % c["release_config_file"])
             except RuntimeError:
                 self.fatal("Invalid release config file %s!" % c["release_config_file"])
             self.release_config['version'] = rc['version']
             self.release_config['buildnum'] = rc['buildNumber']
             self.release_config['ftp_server'] = rc['stagingServer']
             self.release_config['ftp_user'] = c.get('ftp_user', rc['hgUsername'])
             self.release_config['ftp_ssh_key'] = c.get('ftp_ssh_key', rc['hgSshKey'])
+            self.release_config['release_channel'] = rc['releaseChannel']
         else:
             self.info("No release config file; using default config.")
             for key in ('version', 'buildnum',
                         'ftp_server', 'ftp_user', 'ftp_ssh_key'):
                 self.release_config[key] = c[key]
         self.info("Release config:\n%s" % self.release_config)
         return self.release_config
--- a/testing/mozharness/mozharness/mozilla/updates/balrog.py
+++ b/testing/mozharness/mozharness/mozilla/updates/balrog.py
@@ -85,16 +85,17 @@ class BalrogMixin(object):
 
     def submit_balrog_release_pusher(self, dirs):
         product = self.buildbot_config["properties"]["product"]
         cmd = [self.query_exe("python"), os.path.join(os.path.join(dirs['abs_tools_dir'], "scripts/updates/balrog-release-pusher.py"))]
         cmd.extend(["--build-properties", os.path.join(dirs["base_work_dir"], "balrog_props.json")])
         cmd.extend(["--buildbot-configs", "https://hg.mozilla.org/build/buildbot-configs"])
         cmd.extend(["--release-config", os.path.join(dirs['build_dir'], self.config.get("release_config_file"))])
         cmd.extend(["--credentials-file", os.path.join(dirs['base_work_dir'], self.config.get("balrog_credentials_file"))])
+        cmd.extend(["--release-channel", self.query_release_config()['release_channel']])
 
         return_codes = []
         for server in self.config["balrog_servers"]:
 
             server_args = [
                 "--api-root", server["balrog_api_root"],
                 "--username", self._query_balrog_username(server, product)
             ]