From e893cc4b403883eb498f94776f33d721fb42d578 Mon Sep 17 00:00:00 2001 From: David Ames Date: Mon, 10 Sep 2018 15:20:04 -0700 Subject: [PATCH] Do not wait for idleness after pre-series-upgrade The pre-series-upgrade hook stops the juju agent. This can cause the juju wait for idleness to wait forever. Wait for the expected workload status instead. --- zaza/utilities/generic.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/zaza/utilities/generic.py b/zaza/utilities/generic.py index b001db5..d7743b2 100644 --- a/zaza/utilities/generic.py +++ b/zaza/utilities/generic.py @@ -270,15 +270,12 @@ def series_upgrade(unit_name, machine_num, application = unit_name.split('/')[0] logging.info("Prepare series upgrade on {}".format(machine_num)) juju_utils.prepare_series_upgrade(machine_num, to_series=to_series) - logging.info("Watiing for model idleness") - model.block_until_all_units_idle() logging.info("Watiing for workload status 'unknown' on {}" .format(unit_name)) model.block_until_unit_wl_status(unit_name, "unknown") wrap_do_release_upgrade(unit_name, from_series=from_series, to_series=to_series, files=files, workaround_script=workaround_script) - model.block_until_all_units_idle() logging.info("Reboot {}".format(unit_name)) reboot(unit_name) logging.info("Watiing for workload status 'blocked' on {}"