Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager:test-on-uc20 into ~snappy-hwe-team/snappy-hwe-snaps/+git/modem-manager:snap-20

[Alfonso Sanchez-Beato]

tests: adapt to run on UC20

tests: adapt to run on UC20

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 6a1f448ffee9268e75092c7b6718939f6de5314f

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1342/

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:6a1f448ffee9268e75092c7b6718939f6de5314f
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/520/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/553
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/553
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/553
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/553
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1342
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1084
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1133/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/520/rebuild

review: Approve (continuous-integration)

diff --git a/run-tests.sh b/run-tests.sh
index 04c3b9f..7f827b6 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Copyright (C) 2016 Canonical Ltd
 #
@@ -17,63 +17,81 @@
 set -e
 
 TESTS_EXTRAS_URL="https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/stack-snaps-tools"
-TESTS_EXTRAS_PATH="stack-snaps-tools"
+TESTS_EXTRAS_PATH="tests-extras"
 
-# Display help.
-# This has to be in sync with the tests-extras/test-runner.sh script
-# functionalities as the parameters to this one are passed directly there
-# this function will quit the script because of the 'exec' keyword
 show_help() {
     exec cat <<'EOF'
 Usage: run-tests.sh [OPTIONS]
 
 This is fetch & forget script and what it does is to fetch the
-tests-extras repository and execute the run-tests.sh script from
+stack-snaps-tools repository and execute the run-tests.sh script from
 there passing arguments as-is.
 
-optional arguments:
-  --help                 Show this help message and exit
-  --channel              Select another channel to build the base image from (default: stable)
-  --snap                 Extra snap to install
-  --debug                Enable verbose debugging output
-  --test-from-channel    Pull network-manager snap from the specified channel instead of building it from source
-  --force-new-image      Force generating a new image used for testing
+When you see this message you don't have the tests-extras folder
+successfully populated in your workspace yet. Please rerun without
+specifying --help to proceed with the initial clone of the git repository.
 EOF
 }
 
-# Clone the tests-extras repository
+# Clone the stack-snaps-tools repository
 clone_tests_extras() {
-	echo "INFO: Fetching tests-extras scripts into $TESTS_EXTRAS_PATH ..."
-	git clone -b master $TESTS_EXTRAS_URL $TESTS_EXTRAS_PATH >/dev/null 2>&1
-	if [ $? -ne 0 ]; then
-		echo "ERROR: Failed to fetch the $TESTS_EXTRAS_URL repo, exiting.."
-		exit 1
-	fi
+    echo "INFO: Fetching stack-snaps-tools scripts into $TESTS_EXTRAS_PATH ..."
+    if ! git clone -b master $TESTS_EXTRAS_URL $TESTS_EXTRAS_PATH >/dev/null 2>&1; then
+        echo "ERROR: Failed to fetch the $TESTS_EXTRAS_URL repo, exiting.."
+        exit 1
+    fi
 }
 
-# Make sure the already cloned tests-extras repository is in a known and update
+# Make sure the already cloned stack-snaps-tools repository is in a known and update
 # state before it is going to be used.
 restore_and_update_tests_extras() {
-	echo "INFO: Restoring and updating $TESTS_EXTRAS_PATH"
-	cd $TESTS_EXTRAS_PATH && git reset --hard && git clean -dfx && git pull
-	cd -
+    echo "INFO: Restoring and updating $TESTS_EXTRAS_PATH"
+    cd $TESTS_EXTRAS_PATH && git reset --hard && git clean -dfx && git pull
+    cd -
 }
 
 # ==============================================================================
-# This is fetch & forget script and what it does is to fetch the tests-extras
+# This is fetch & forget script and what it does is to fetch the stack-snaps-tools
 # repo and execute the run-tests.sh script from there passing arguments as-is.
 #
-# The tests-extras repository ends up checked out in the snap tree but as a
+# The stack-snaps-tools repository ends up checked out in the snap tree but as a
 # hidden directory which is re-used since then.
 
-# Display help w/o fetching anything and exit
-[ "$1" = "--help" ] && show_help
+# Find snap to use in the tests
+snaps=$(find . -maxdepth 1 -type f -name \
+             "*_*_$(dpkg-architecture -q DEB_HOST_ARCH).snap")
+while read -r snap_file; do
+    if [ -n "$snap" ]; then
+        printf "More than one snap revision in the folder\n"
+        exit 1
+    fi
+    snap=$PWD/${snap_file#*/}
+done < <(printf "%s\n" "$snaps")
+
+[ ! -d "$TESTS_EXTRAS_PATH" ] && [ "$1" = "--help" ] && show_help
 
 if [ -d "$TESTS_EXTRAS_PATH" ]; then
-	restore_and_update_tests_extras
+    restore_and_update_tests_extras
 else
-	clone_tests_extras
+    clone_tests_extras
+fi
+
+# Any project-specific options for test-runner should be specified in
+# .tests_config under EXTRA_ARGS
+if [ -f ".tests_config" ]; then
+    # shellcheck disable=SC1091
+    . .tests_config
 fi
 
+# Get backends
+backends="--backends="
+separator=""
+while read -r be; do
+    backends=$backends$separator${be##*.}
+    separator=,
+done < <(yq r spread.yaml --printMode p 'backends.qemu.systems[*].*')
+
 echo "INFO: Executing tests runner"
-cd $TESTS_EXTRAS_PATH && ./tests-runner.sh "$@"
+# shellcheck disable=SC2086
+cd $TESTS_EXTRAS_PATH &&
+    ./tests-runner.sh "$@" --snap="$snap" "$backends" $EXTRA_ARGS
diff --git a/spread.yaml b/spread.yaml
index 1368084..9a775ca 100644
--- a/spread.yaml
+++ b/spread.yaml
@@ -28,8 +28,10 @@ environment:
 
 backends:
     qemu:
+        memory: 4G
         systems:
-            - ubuntu-core-16:
+            - ubuntu-core-20:
+                bios: /usr/share/OVMF/OVMF_CODE.fd
                 username: test
                 password: test
 
@@ -55,7 +57,7 @@ suites:
     tests/main/:
         summary: Full-system tests for ModemManager
         systems:
-            - ubuntu-core-16
+            - ubuntu-core-20
         prepare: |
             . $TESTSLIB/prepare.sh
         restore-each: |
diff --git a/tests/lib/prepare-all.sh b/tests/lib/prepare-all.sh
index 979e57d..08ae20a 100644
--- a/tests/lib/prepare-all.sh
+++ b/tests/lib/prepare-all.sh
@@ -1,42 +1,4 @@
-#!/bin/sh
+#!/bin/bash -x
 
-# We don't have to build a snap when we should use one from a channel
-if [ -n "$SNAP_CHANNEL" ] ; then
-	exit 0
-fi
-
-# If there is a snap prebuilt for us, lets take that one to speed things up
-if [ -e $PROJECT_PATH/${SNAP_NAME}_*_${SNAP_ARCH}.snap ] ; then
-	exit 0
-fi
-
-
-# Setup classic snap and build the snap in there
-snap install --devmode --beta classic
-cat <<-EOF > /home/test/build-snap.sh
-#!/bin/sh
-set -ex
-
-export DEBIAN_FRONTEND=noninteractive
-
-# FIXME: Enable propose for now until problems with conflicting systemd
-# packages between the Ubuntu Core image ppa and the archive are fixed.
-echo "deb http://archive.ubuntu.com/ubuntu/ xenial-proposed restricted main universe" > /etc/apt/sources.list.d/ubuntu-proposed.list
-echo "deb http://ppa.launchpad.net/snappy-dev/image/ubuntu xenial main" > /etc/apt/sources.list.d/ubuntu-image-ppa.list
-
-# Ensure we have the latest updates installed as the core snap
-# may be a bit out of date.
-apt update
-apt -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' full-upgrade -y --force-yes
-
-apt install -y --force-yes snapcraft
-cd $PROJECT_PATH
-snapcraft clean
-snapcraft
-EOF
-chmod +x /home/test/build-snap.sh
-sudo classic /home/test/build-snap.sh
-snap remove classic
-
-# Make sure we have a snap build
-test -e $PROJECT_PATH/${SNAP_NAME}_*_${SNAP_ARCH}.snap
+# Nothing to do here for the moment
+exit 0
diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh
index 185bacb..cdf9213 100644
--- a/tests/lib/prepare.sh
+++ b/tests/lib/prepare.sh
@@ -1,6 +1,7 @@
-#!/bin/sh
+#!/bin/bash -ex
 
-. $TESTSLIB/utilities.sh
+# shellcheck source=tests/lib/utilities.sh
+. "$TESTSLIB"/utilities.sh
 
 echo "Wait for firstboot change to be ready"
 while ! snap changes | grep -q "Done"; do
@@ -10,9 +11,10 @@ while ! snap changes | grep -q "Done"; do
 done
 
 echo "Ensure fundamental snaps are still present"
-. $TESTSLIB/snap-names.sh
-for name in $gadget_name $kernel_name $core_name; do
-	if ! snap list | grep -q $name ; then
+# shellcheck source=tests/lib/snap-names.sh
+. "$TESTSLIB"/snap-names.sh
+for name in "$gadget_name" "$kernel_name" "$core_name"; do
+	if ! snap list | grep -q "$name" ; then
 		echo "Not all fundamental snaps are available, all-snap image not valid"
 		echo "Currently installed snaps:"
 		snap list
@@ -22,13 +24,6 @@ done
 
 install_snap_under_test
 
-# Snapshot of the current snapd state for a later restore
-if [ ! -f $SPREAD_PATH/snapd-state.tar.gz ] ; then
-	systemctl stop snapd.service snapd.socket
-	tar czf $SPREAD_PATH/snapd-state.tar.gz /var/lib/snapd /etc/netplan
-	systemctl start snapd.socket
-fi
-
 # For debugging dump all snaps and connected slots/plugs
 snap list
-snap interfaces
+snap connections --all
diff --git a/tests/lib/restore-each.sh b/tests/lib/restore-each.sh
index 5b62c4b..deea076 100644
--- a/tests/lib/restore-each.sh
+++ b/tests/lib/restore-each.sh
@@ -1,12 +1,13 @@
-#!/bin/sh
+#!/bin/bash -ex
 
-. $TESTSLIB/snap-names.sh
+# shellcheck source=tests/lib/snap-names.sh
+. "$TESTSLIB"/snap-names.sh
 
 # Remove all snaps not being the core, gadget, kernel or snap we're testing
 for snap in /snap/*; do
 	snap="${snap:6}"
 	case "$snap" in
-		"bin" | "$gadget_name" | "$kernel_name" | core* | "$SNAP_NAME" )
+		README | bin | "$gadget_name" | "$kernel_name" | core* | snapd | "$SNAP_NAME")
 			;;
 		*)
 			snap remove "$snap"
@@ -16,16 +17,9 @@ done
 
 # Cleanup all configuration files from ModemManager so that we have
 # a fresh start for the next test
+systemctl stop snap.modem-manager.modemmanager
 rm -rf /var/snap/modem-manager/common/*
 rm -rf /var/snap/modem-manager/current/*
-systemctl stop snap.modem-manager.modemmanager
-
-# Ensure we have the same state for snapd as we had before
-systemctl stop snapd.service snapd.socket
-rm -rf /var/lib/snapd/*
-$(cd / && tar xzf $SPREAD_PATH/snapd-state.tar.gz)
-rm -rf /root/.snap
-systemctl start snapd.service snapd.socket
 
 # Bringup ModemManager again now that the system is restored
 systemctl start snap.modem-manager.modemmanager
diff --git a/tests/lib/snap-names.sh b/tests/lib/snap-names.sh
index 71c9628..f15b09a 100644
--- a/tests/lib/snap-names.sh
+++ b/tests/lib/snap-names.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 gadget_name=$(snap list | sed -n 's/^\(pc\|pi[23]\|dragonboard\) .*/\1/p')
 kernel_name=$gadget_name-kernel
 core_name=$(snap list | awk '/^(ubuntu-)?core / {print $1; exit}')
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
index f756f66..f0aa6d7 100644
--- a/tests/lib/utilities.sh
+++ b/tests/lib/utilities.sh
@@ -8,7 +8,7 @@ wait_for_modem_manager() {
 }
 
 stop_after_first_reboot() {
-	if [ $SPREAD_REBOOT -eq 1 ] ; then
+	if [ "$SPREAD_REBOOT" -eq 1 ] ; then
 		exit 0
 	fi
 }
@@ -18,22 +18,22 @@ install_snap_under_test() {
 	# without any network connectivity after reboot.
 	if [ -n "$SNAP_CHANNEL" ] ; then
 		# Don't reinstall if we have it installed already
-		if ! snap list | grep $SNAP_NAME ; then
-			snap install --$SNAP_CHANNEL $SNAP_NAME
+		if ! snap list | grep "$SNAP_NAME"; then
+			snap install --"$SNAP_CHANNEL" "$SNAP_NAME"
 		fi
 	else
 		# Install first from store to avoid error when performing the connection
-		snap install $SNAP_NAME
+		snap install "$SNAP_NAME"
 		# Install prebuilt snap
-		snap install --dangerous ${PROJECT_PATH}/${SNAP_NAME}_*_${SNAP_ARCH}.snap
+		snap install --dangerous "$PROJECT_PATH"/"$SNAP_NAME"_*_"$SNAP_ARCH".snap
 		if [ -n "$SNAP_AUTO_ALIASES" ]; then
 			snapd_version=$(snap version | awk '/^snapd / {print $2; exit}')
 			for alias in $SNAP_AUTO_ALIASES ; do
-				target=$SNAP_NAME.$alias
-				if dpkg --compare-versions $snapd_version lt 2.25 ; then
-					target=$SNAP_NAME
+				target="$SNAP_NAME".$alias
+				if dpkg --compare-versions "$snapd_version" lt 2.25 ; then
+					target="$SNAP_NAME"
 				fi
-				snap alias $target $alias
+				snap alias "$target" "$alias"
 			done
 		fi
 	fi
diff --git a/tests/main/network-manager-autoconn/task.yaml b/tests/main/network-manager-autoconn/task.yaml
index 7092b7f..23cff72 100644
--- a/tests/main/network-manager-autoconn/task.yaml
+++ b/tests/main/network-manager-autoconn/task.yaml
@@ -6,8 +6,12 @@ execute: |
     # Service should be up an running
     wait_for_modem_manager
 
-    snap install network-manager
+    snap install --channel=20/beta network-manager
 
     # Ensure all necessary plugs/slots are connected
     snap interfaces | grep -Ezq "modem-manager:service .*modem-manager:mmcli"
     snap interfaces | grep -Ezq "modem-manager:service .*network-manager:modem-manager"
+
+    # Set renderer back to networkd
+    snap set network-manager defaultrenderer=false
+    sleep 2