Merge lp:~mthaddon/mojo/ntp-focal into lp:mojo/mojo-specs

[Tom Haddon]

charm-testing/ntp: if we're on focal, only check chrony

charm-testing/ntp: if we're on focal, only check chrony.

Also some re-indenting for clarity.

[🤖 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)]

Merge proposal is approved, but source revision has changed, setting status to needs review.

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

Change successfully merged at revision 153

=== modified file 'charm-testing/ntp/post-deploy'
--- charm-testing/ntp/post-deploy	2018-09-03 09:35:45 +0000
+++ charm-testing/ntp/post-deploy	2020-02-19 23:01:18 +0000
@@ -14,25 +14,33 @@
 }
 
 case $MOJO_SERIES in
+    focal)
+        # After bionic: only chrony
+        chronyd_check
+        ;;
     trusty|xenial)
-	# Before bionic: only ntpd
-	ntpd_check
-	;;
+        # Before bionic: only ntpd
+        ntpd_check
+        ;;
+    bionic)
+        # bionic: pre-upgrade == ntpd, post-upgrade == chronyd
+        case $PHASE in
+            upgrade|redeploy)
+                chronyd_check
+                ;;
+            initial)
+                ntpd_check
+                ;;
+            *)
+                echo "ERROR: unknown phase"
+                exit 1
+                ;;
+        esac
+        ;;
     *)
-	# bionic and later: pre-upgrade == ntpd, post-upgrade == chronyd
-	case $PHASE in
-	upgrade|redeploy)
-	    chronyd_check
-	    ;;
-	initial)
-	    ntpd_check
-	    ;;
-	*)
-	    echo "ERROR: unknown phase"
-	    exit 1
-	    ;;
-	esac
-	;;
+        echo "ERROR: unknown series"
+        exit 1
+        ;;
 esac
 
 echo "######################### Post-deploy done #########################"