зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1429603: Removed unused balrog code helper methods from mozhanress; r=jlund
Differential Revision: https://phabricator.services.mozilla.com/D534 --HG-- extra : rebase_source : 2cc8d3552fca1995b4b5fa70e98ce6e950644636
This commit is contained in:
Родитель
d3ed5206be
Коммит
980166261f
|
@ -8,14 +8,6 @@ from mozharness.base.log import INFO
|
|||
# BalrogMixin {{{1
|
||||
class BalrogMixin(object):
|
||||
|
||||
@staticmethod
|
||||
def _query_balrog_username(server_config, product=None):
|
||||
username = server_config["balrog_usernames"].get(product)
|
||||
if username:
|
||||
return username
|
||||
else:
|
||||
raise KeyError("Couldn't find balrog username.")
|
||||
|
||||
def query_python(self):
|
||||
python = sys.executable
|
||||
# A mock environment is a special case, the system python isn't
|
||||
|
@ -50,92 +42,6 @@ class BalrogMixin(object):
|
|||
|
||||
self.dump_config(props_path, balrog_props)
|
||||
|
||||
def submit_balrog_updates(self, release_type="nightly", product=None):
|
||||
c = self.config
|
||||
dirs = self.query_abs_dirs()
|
||||
|
||||
if self.buildbot_config and "properties" in self.buildbot_config:
|
||||
product = self.buildbot_config["properties"]["product"]
|
||||
|
||||
if product is None:
|
||||
self.fatal('There is no valid product information.')
|
||||
|
||||
props_path = os.path.join(dirs["base_work_dir"], "balrog_props.json")
|
||||
credentials_file = os.path.join(
|
||||
dirs["base_work_dir"], c["balrog_credentials_file"]
|
||||
)
|
||||
submitter_script = os.path.join(
|
||||
dirs["abs_tools_dir"], "scripts", "updates", "balrog-submitter.py"
|
||||
)
|
||||
|
||||
self.generate_balrog_props(props_path)
|
||||
|
||||
cmd = [
|
||||
self.query_python(),
|
||||
submitter_script,
|
||||
"--build-properties", props_path,
|
||||
"-t", release_type,
|
||||
"--credentials-file", credentials_file,
|
||||
]
|
||||
if self._log_level_at_least(INFO):
|
||||
cmd.append("--verbose")
|
||||
|
||||
return_codes = []
|
||||
for server in c["balrog_servers"]:
|
||||
server_args = [
|
||||
"--api-root", server["balrog_api_root"],
|
||||
"--username", self._query_balrog_username(server, product)
|
||||
]
|
||||
if server.get("url_replacements"):
|
||||
for replacement in server["url_replacements"]:
|
||||
server_args.append("--url-replacement")
|
||||
server_args.append(",".join(replacement))
|
||||
|
||||
self.info("Calling Balrog submission script")
|
||||
return_code = self.retry(
|
||||
self.run_command, attempts=5, args=(cmd + server_args,),
|
||||
good_statuses=(0,),
|
||||
)
|
||||
if server["ignore_failures"]:
|
||||
self.info("Ignoring result, ignore_failures set to True")
|
||||
else:
|
||||
return_codes.append(return_code)
|
||||
# return the worst (max) code
|
||||
return max(return_codes)
|
||||
|
||||
def submit_balrog_release_pusher(self, dirs):
|
||||
product = self.buildbot_config["properties"]["product"]
|
||||
cmd = [
|
||||
self.query_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)
|
||||
]
|
||||
|
||||
self.info("Calling Balrog release pusher script")
|
||||
return_code = self.retry(
|
||||
self.run_command, args=(cmd + server_args,),
|
||||
kwargs={'cwd': dirs['abs_work_dir']},
|
||||
good_statuses=(0,),
|
||||
)
|
||||
if server["ignore_failures"]:
|
||||
self.info("Ignoring result, ignore_failures set to True")
|
||||
else:
|
||||
return_codes.append(return_code)
|
||||
# return the worst (max) code
|
||||
return max(return_codes)
|
||||
|
||||
def lock_balrog_rules(self, rule_ids):
|
||||
c = self.config
|
||||
dirs = self.query_abs_dirs()
|
||||
|
|
Загрузка…
Ссылка в новой задаче