Merge ~ack/ubuntu/+source/maas:snap-channel-2.7-default into ubuntu/+source/maas:ubuntu/focal-devel

[Alberto Donato]

Install snap from the 2.7/stable/ubuntu-$release channel by default.

- If currently installed maas is newer than 2.7, install from matching track.
- Rename maas/snap-track debconf var to maas/snap-channel (as the /ubuntu-$release is no longer appended)
- Fix wrong display of "MAAS not currently set up" message
- No-op when upgrading from a previous version of the transitional deb.

[Julian Andres Klode (juliank)]

I'd avoid renaming the template, as that just causes churn in the database I suppose.

The version logic to not do the migration also triggers if you removed the maas snap (but not purged) and then reinstalled - is that correct?

[Alberto Donato (ack)]

> I'd avoid renaming the template, as that just causes churn in the database I
> suppose.

Is that a big deal?
I renamed it as the new name is more correct, and the old option has unlikely been ever used since we were always appending the "/ubuntu-$release" branch, which only existed for 20.04.
I can revert to the old name if it's an issue.

>
> The version logic to not do the migration also triggers if you removed the
> maas snap (but not purged) and then reinstalled - is that correct?

If you previously had installed a 1:* release, the migration would have been performed. Removing and reinstalling the deb shouldn't do anything in that case too.

e344f4f... by Alberto Donato on 2020-05-18

fix debian/maas-track template

[Julian Andres Klode (juliank)]

Oh, I thought you did that, but you also still need an SRU bug https://wiki.ubuntu.com/StableReleaseUpdates#SRU_Bug_Template and set the target release to focal in changelog.

review: Needs Fixing

9d21b6a... by Alberto Donato on 2020-05-18

fix changelog release

84aff9b... by Alberto Donato on 2020-05-18

fix changelog

[Julian Andres Klode (juliank)]

review: Approve

Unmerged commits

84aff9b... by Alberto Donato on 2020-05-18

fix changelog

9d21b6a... by Alberto Donato on 2020-05-18

fix changelog release

e344f4f... by Alberto Donato on 2020-05-18

fix debian/maas-track template

bceb82a... by Alberto Donato on 2020-05-11

no-op if upgrading from a transitional deb

f214ec7... by Alberto Donato on 2020-05-11

fix not setup notice

54d09cc... by Alberto Donato on 2020-05-11

always point to the release branch if a channel is not specified

4580b3e... by Alberto Donato on 2020-05-05

point at 2.7 branch by default, unless installed maas is newer

8d80ee7... by Alberto Donato on 2020-03-09

Import patches-unapplied version 1:0.6 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: da0746bb20c11f985e4a2a2d0a96f87007976316

New changelog entries:
  * Fix snapd version check for default track support
  * Check if the snap is already installed, prompt the user in case it is

da0746b... by Alberto Donato on 2020-02-27

Import patches-unapplied version 1:0.5 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: 4b7509341f2cf5e617b5ef5ac1d09b52dd164f4e

New changelog entries:
  * Fix all lintian warning/errors

4b75093... by Alberto Donato on 2020-02-26

Import patches-unapplied version 1:0.4 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Upload parent: 14daa6d5fc4e98104718d3655ea489cf643f48f5

diff --git a/debian/changelog b/debian/changelog
index ca80f42..4809cde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+maas (1:0.7) focal; urgency=medium
+
+  * When a track is not specified, default to 2.7/stable. If MAAS deb
+    version is higher than 2.7, pick the same track. LP: #1878769
+  * Fix issue where "MAAS not currently set up" notice shows even when the
+    snap is configured.
+  * No-op when upgrading from a transitional deb, as migration already
+    happened.
+  * Rename "get_snap_mode" to "snap_mode".
+  * Rename DEFAULT_SNAP_* variables to align with snap terminology.
+
+ -- Alberto Donato <[e-mail]>  Wed, 06 May 2020 13:48:50 +0200
+
 maas (1:0.6) focal; urgency=medium
 
   * Fix snapd version check for default track support
diff --git a/debian/maas.preinst b/debian/maas.preinst
index 2279230..a1ae4ea 100755
--- a/debian/maas.preinst
+++ b/debian/maas.preinst
@@ -1,8 +1,7 @@
 #!/bin/bash -e
 
-DEFAULT_UBUNTU_RELEASE="20.04"
-DEFAULT_SNAP_VERSION="2.7"
-DEFAULT_SNAP_TRACK="stable"
+DEFAULT_SNAP_TRACK="2.7"
+DEFAULT_SNAP_RISK="stable"
 
 SNAP_COMMON="/var/snap/maas/common"
 
@@ -12,6 +11,20 @@ error_exit() {
     exit 1
 }
 
+os_release() {
+    # shellcheck disable=SC1091
+    (. /etc/os-release && echo "$VERSION_ID")
+}
+
+maas_version() {
+    # only return major.minor version
+    dpkg-query -W -f'${Version}\n' maas-common 2>/dev/null | cut -d. -f1,2
+}
+
+is_version() {
+    dpkg --compare-versions "$@"
+}
+
 is_deb_installed() {
     dpkg-query -W -f'${Status}\n' "$1" 2>/dev/null | grep -q ^install
 }
@@ -20,19 +33,13 @@ is_snap_installed() {
     snap list "$1" >/dev/null 2>&1
 }
 
-get_snap_mode() {
-    local snap_mode
-    snap_mode=$(cat "$SNAP_COMMON/snap_mode" 2>/dev/null || true)
-    if [ -z "$snap_mode" ]; then
-        snap_mode="none"
+snap_mode() {
+    local mode
+    mode=$(cat "$SNAP_COMMON/snap_mode" 2>/dev/null || true)
+    if [ -z "$mode" ]; then
+        mode="none"
     fi
-    echo "$snap_mode"
-}
-
-snapd_has_default_track_support() {
-    local version
-    version=$(snap version | awk '$1 == "snapd" { print $2; }')
-    dpkg --compare-versions "$version" ">=" "2.44"
+    echo "$mode"
 }
 
 ensure_snap_not_installed() {
@@ -94,18 +101,17 @@ install_snap() {
     db_input medium maas/snap-track || true
     db_go || true
     db_get maas/snap-track
-    local track="$RET"
-    if [ -z "$track" ]; then
-        track="$DEFAULT_SNAP_TRACK"
-        snapd_has_default_track_support || track="$DEFAULT_SNAP_VERSION/$track"
-    fi
-
-    local release="$DEFAULT_UBUNTU_RELEASE"
-    if [ -e "/etc/os-release" ]; then
-        release=$(. /etc/os-release && echo "$VERSION_ID")
+    local channel="$RET"
+    if [ -z "$channel" ]; then
+        local track
+        track="$(maas_version)"
+        if [ -z "$track" ] || is_version "$track" "<<" "$DEFAULT_SNAP_TRACK"; then
+            track="$DEFAULT_SNAP_TRACK"
+        fi
+        channel="$track/$DEFAULT_SNAP_RISK/ubuntu-$(os_release)"
     fi
 
-    snap install maas --channel="${track}/ubuntu-${release}"
+    snap install maas --channel="$channel"
 }
 
 migrate_to_snap() {
@@ -121,7 +127,9 @@ preserve_db() {
 
 notify_if_not_setup() {
     # only show the notice if MAAS is not setup
-    [ "$(get_snap_mode)" != "none" ] || return 0
+    if [ "$(snap_mode)" != "none" ]; then
+        return 0
+    fi
     db_input high maas/snap-needs-setup || true
     db_go || true
 }
@@ -134,12 +142,20 @@ case "$1" in
         ;;
     install|upgrade)
         # only perform tasks in these cases
+        old_version="$2"
         ;;
     *)
         error_exit "preinst called with unknown argument: $1"
         ;;
 esac
 
+if [[ "$old_version" = 1:* ]]; then
+    # upgrading from a transitional snap, nothing to do as migration already
+    # happened
+    exit 0
+fi
+
+# shellcheck disable=SC1091
 . /usr/share/debconf/confmodule
 
 ensure_snap_not_installed
diff --git a/debian/maas.templates b/debian/maas.templates
index f81df06..b260d66 100644
--- a/debian/maas.templates
+++ b/debian/maas.templates
@@ -1,10 +1,8 @@
 Template: maas/snap-track
 Type: string
-_Description: Track for the MAAS snap:
+_Description: Channel for the MAAS snap:
  This can be specified just as a track name (e.g. "2.7", "latest", ...) or include
  a risk as well (e.g. "latest/candidate").
- .
- If not specified "stable" will be used.
 
 Template: maas/snap-no-connectivity
 Type: select