Merge ~hloeung/juju-upgrader:master into juju-upgrader:master

[Haw Loeung]

Default to upgrade all models and pause after a bunch done

We ensure _all_ models are upgraded rather than having to rely on the operator to remember to specify --percent=100. The --percent option was added to handle larger controllers with important models, this pause achieves the same thing with staggering model upgrades.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Thomas Cuthbert (tcuthbert)]

LGTM +1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 507e9f6d95bb245b288fbe83dbf4985cd88e1a42

diff --git a/juju-upgrader b/juju-upgrader
index 878349b..7de4fad 100755
--- a/juju-upgrader
+++ b/juju-upgrader
@@ -170,8 +170,8 @@ def parse_args():
     parser.add_argument(
         "--percent",
         type=float,
-        default=15,
-        help="Attempt upgrades on a maximum of PERCENT percent of the non-empty models. (default: 15) "
+        default=100,
+        help="Attempt upgrades on a maximum of PERCENT percent of the non-empty models. (default: 100) "
         "Has no effect on empty models, which are always upgraded.",
     )
     parser.add_argument(
@@ -199,6 +199,13 @@ def parse_args():
         default=False,
         help="Answer yes to any confirmation prompts. (default: False)",
     )
+    parser.add_argument(
+        "--pause",
+        action="store_true",
+        dest='pause',
+        default=True,
+        help="Pause between bunch of models. (default: True)",
+    )
 
     args = parser.parse_args()
 
@@ -426,6 +433,7 @@ def juju_upgrader(args, stats):
             ignore_errors=True,
             dry_run=args.dry_run,
             proposed=args.proposed,
+            pause=args.pause,
         )
         not_upgraded = juju_utils.upgrade_models(
             'healthy',
diff --git a/juju_utils.py b/juju_utils.py
index 5043c26..346c8bc 100644
--- a/juju_utils.py
+++ b/juju_utils.py
@@ -65,7 +65,9 @@ def find_model(models, name):
     return None
 
 
-def upgrade_models(title, models, version, delay, percent, ignore_errors=False, dry_run=False, proposed=False):
+def upgrade_models(
+    title, models, version, delay, percent, ignore_errors=False, dry_run=False, proposed=False, pause=True
+):
     if len(models) < 1:
         return []
     num_models = len(models)
@@ -86,6 +88,12 @@ def upgrade_models(title, models, version, delay, percent, ignore_errors=False, 
             progress('    Failed upgrade, return code {}'.format(ret))
             continue
         time.sleep(delay)
+        # Pause upgrade after 40 models.
+        if pause and index % 40 == 0:
+            answer = input(r"Continue upgrading more models ('no' to abort)? ")
+            if answer.lower().startswith('no'):
+                print('Not continuing with upgrade')
+                break
     progress('Attempted upgrade on {} models'.format(index + 1))
     return skipped