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

[Haw Loeung]

Warn on local agent binary and fixed dry-run output for upgrade models

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

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

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

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[Stuart Bishop (stub)]

Yup

review: Approve

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

Change successfully merged at revision c65058b3b819ea56e203986c77ec4f4373c9bbdb

diff --git a/juju-upgrader b/juju-upgrader
index 3fca166..878349b 100755
--- a/juju-upgrader
+++ b/juju-upgrader
@@ -250,8 +250,13 @@ def controller_report(args, cli_ver, target_ver, models, ctrl_name, ctrl_ver, ct
     else:
         print('Controller health: OK')
 
-    if not upgrade and not args.proposed:
-        print('\nController already at the latest version available ({})'.format(ctrl_ver))
+    if not upgrade:
+        print('Controller already at the latest version available ({})'.format(ctrl_ver))
+        if juju_utils.compare_for_newer_version(ctrl_ver, cli_ver):
+            msg = '\nWarning - no upgrade available in agent stream, local agent binary will be used ({}.1)'.format(
+                target_ver
+            )
+            print(msg)
     elif juju_utils.compare_for_newer_version(target_ver, upgrade or cli_ver):
         print('\nWarning - target version ({}) is not the latest upgrade available ({})'.format(target_ver, upgrade))
 
@@ -295,6 +300,12 @@ def upgrade_controller(args, ctrl_unhealthy, ctrl_name, ctrl_model, ctrl_ver, ta
     if not juju_utils.perform_upgrade(ctrl_model, target_ver, args):
         return False
 
+    # For --dry-run, we want to assume that the controller
+    # successfully upgraded to the target version, otherwise,
+    # model upgrade will show that nothing needs to be done.
+    if args.dry_run:
+        return target_ver
+
     new_ver = poll_upgrade(ctrl_model)
     if args.dry_run:
         return new_ver