Merge ~sylvain-pineau/checkbox-snappy/+git/checkbox-snappy-classic:interim_release_support into checkbox-snappy:master

[Sylvain Pineau]

Patches required to make checkbox-snappy-classic compatible with interim releases.

Requires:

- https://code.launchpad.net/~sylvain-pineau/checkbox-core-snap/+git/checkbox-core-snap/+merge/401725
- https://code.launchpad.net/~sylvain-pineau/checkbox-ng/+git/checkbox-ng/+merge/401767

Unmerged commits

2066223... by Sylvain Pineau on 2021-04-26

wrapper_local: Move $PERL5LIB export after the $PATH adjustments

Otherwise perl is the one from the host not the snap and can't load extra
modules only available in the snap.

8c5502e... by Sylvain Pineau on 2021-04-26

hooks:install: Preserve sudoer include directive with the pound (#) character

To stay comptabible with older version of sudo that don't understand the @include.

See https://unix.stackexchange.com/questions/244064/why-are-the-include-and-includedir-directives-in-sudo-prefixed-with-the-pound

16cc0f9... by PMR <pmr@pmr-lander> on 2021-03-26

Merge #400248 from ~jocave/checkbox-snappy/+git/checkbox-snappy-classic:use-service-subcommand

4fc06c9... by Jonathan Cave on 2021-03-26

Change: use service subcommand

595baea... by PMR <pmr@pmr-lander> on 2021-03-26

Merge #400135 from ~jocave/checkbox-snappy/+git/checkbox-snappy-classic:remove-old-launchers

fb32a14... by Jonathan Cave on 2021-03-24

Change: remove unused launchers

9826cf9... by PMR <pmr@pmr-lander> on 2021-02-12

Merge #397983 from ~checkbox-dev/checkbox-snappy/+git/checkbox-snappy-classic:release

Release_2021_Week6

c585d53... by PMR <pmr@pmr-lander> on 2021-02-12

Bump version to next dev release

fae1a2d... by PMR <pmr@pmr-lander> on 2020-12-04

Bump version number and tag parts

d3f0454... by PMR <pmr@pmr-lander> on 2020-12-04

Merge #394895 from ~checkbox-dev/checkbox-snappy/+git/checkbox-snappy-classic:release

Release_2020_Week49

diff --git a/launchers/client-cert-iot-server b/launchers/client-cert-iot-server
new file mode 100755
index 0000000..1b858fb
--- /dev/null
+++ b/launchers/client-cert-iot-server
@@ -0,0 +1,18 @@
+#!/usr/bin/env checkbox-cli-wrapper
+[launcher]
+app_id = com.canonical.certification:checkbox-snappy
+launcher_version = 1
+stock_reports = text, submission_files
+
+[test plan]
+unit = com.canonical.certification::client-cert-iot-server-20-04-automated
+forced = yes
+
+[test selection]
+forced = yes
+
+[ui]
+type = silent
+auto_retry = yes
+max_attempts = 4
+delay_before_retry = 30
diff --git a/launchers/configure b/launchers/configure
index b729bb2..86be431 100755
--- a/launchers/configure
+++ b/launchers/configure
@@ -10,6 +10,7 @@ import re
 import sys
 
 sys.path.append(os.path.expandvars("$SNAP/usr/lib/python3/dist-packages"))
+<<<<<<< launchers/configure
 sitepkgpath = "$SNAP/lib/python{}.{}/site-packages".format(
     sys.version_info[0], sys.version_info[1])
 sys.path.append(os.path.expandvars(sitepkgpath))
@@ -18,6 +19,14 @@ sys.path.append(os.path.expandvars(
     "$SNAP/checkbox-runtime/usr/lib/python3/dist-packages"))
 runtimepath = "$SNAP/checkbox-runtime/lib/python{}.{}/site-packages".format(
     sys.version_info[0], sys.version_info[1])
+=======
+sitepkgpath = "$SNAP/lib/python3.8/site-packages"
+sys.path.append(os.path.expandvars(sitepkgpath))
+
+sys.path.append(os.path.expandvars(
+    "/snap/checkbox20/current/usr/lib/python3/dist-packages"))
+runtimepath = "/snap/checkbox20/current/lib/python3.8/site-packages"
+>>>>>>> launchers/configure
 sys.path.append(os.path.expandvars(runtimepath))
 
 try:
@@ -26,6 +35,7 @@ try:
 except ImportError:
     msg = """
 checkbox-support not found!
+<<<<<<< launchers/configure
 You need to connect this snap to the checkbox20 snap.
 
 You can do this with those commands:
@@ -39,6 +49,11 @@ snap connect $SNAP_NAME:provider-docker   checkbox20:provider-docker
 snap connect $SNAP_NAME:provider-tpm2     checkbox20:provider-tpm2
 snap connect $SNAP_NAME:provider-sru      checkbox20:provider-sru
 snap connect $SNAP_NAME:provider-edgex    checkbox20:provider-edgex
+=======
+You need to install the checkbox20 snap:
+
+snap install checkbox20
+>>>>>>> launchers/configure
     """
     print(os.path.expandvars(msg), file=sys.stderr)
     sys.exit(1)
diff --git a/launchers/hw-collection b/launchers/hw-collection
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/launchers/hw-collection
diff --git a/launchers/shell-wrapper b/launchers/shell-wrapper
index 7cd58e7..1382771 100755
--- a/launchers/shell-wrapper
+++ b/launchers/shell-wrapper
@@ -1,7 +1,9 @@
 #!/bin/bash
 
+<<<<<<< launchers/shell-wrapper
 . $(dirname "$(realpath $BASH_SOURCE)")/wrapper_local
 
+=======
+>>>>>>> launchers/shell-wrapper
 echo "$SNAP_NAME runtime shell, type 'exit' to quit the session"
-
 exec bash
diff --git a/launchers/test-runner b/launchers/test-runner
index f7c3b90..6c7044a 100755
--- a/launchers/test-runner
+++ b/launchers/test-runner
@@ -6,4 +6,8 @@ launcher_version = 1
 stock_reports = text, submission_files, certification
 
 [test plan]
+<<<<<<< launchers/test-runner
 filter = com.canonical.certification::client-cert-iot-ubuntucore-20-*
+=======
+filter = com.canonical.certification::client-cert-iot-server-20-04-*
+>>>>>>> launchers/test-runner
diff --git a/launchers/wrapper_local b/launchers/wrapper_local
index 4c85cc2..53beffd 100755
--- a/launchers/wrapper_local
+++ b/launchers/wrapper_local
@@ -18,6 +18,7 @@ esac
 # Launcher common exports for any checkbox app #
 ################################################
 
+<<<<<<< launchers/wrapper_local
 if [ -d $SNAP/checkbox-runtime ]; then
   RUNTIME=$SNAP/checkbox-runtime
   if [ ! -d $RUNTIME/usr ]; then
@@ -41,6 +42,29 @@ if [ -e $RUNTIME/wrapper_common ]; then
   . $RUNTIME/wrapper_common
 else
   echo "ERROR: no $RUNTIME/wrapper_common found"
+=======
+RUNTIME=/snap/checkbox20/current
+if [ ! -d "$RUNTIME" ]; then
+    echo "You need to install the checkbox20 snap."
+    echo ""
+    echo "You can do this with this command:"
+    echo "snap install checkbox20"
+    exit 1
+fi
+
+export LC_ALL=C.UTF-8
+export GI_TYPELIB_PATH=$SNAP/usr/lib/girepository-1.0:$SNAP/usr/lib/$ARCH/girepository-1.0
+export PATH="$SNAP/usr/sbin:$SNAP/sbin:$SNAP/usr/bin:$SNAP/bin:/snap/bin:$PATH"
+export ALSA_CONFIG_PATH=$SNAP/usr/share/alsa/alsa.conf:$SNAP/usr/share/alsa/pcm/default.conf
+export PYTHONPATH="$SNAP/usr/lib/python3/dist-packages:$PYTHONPATH"
+PERL_VERSION=$(perl -e '$^V=~/^v(\d+\.\d+)/;print $1')
+export PERL5LIB="$PERL5LIB:$SNAP/usr/lib/$ARCH/perl/$PERL_VERSION:$SNAP/usr/lib/$ARCH/perl5/$PERL_VERSION:$SNAP/usr/share/perl/$PERL_VERSION:$SNAP/usr/share/perl5"
+
+if [ -e $RUNTIME/wrapper_common_classic ]; then
+  . $RUNTIME/wrapper_common_classic
+else
+  echo "ERROR: no $RUNTIME/wrapper_common_classic found"
+>>>>>>> launchers/wrapper_local
   exit 1
 fi
 
diff --git a/snap/hooks/configure b/snap/hooks/configure
index 036ede2..ecff58c 100755
--- a/snap/hooks/configure
+++ b/snap/hooks/configure
@@ -21,27 +21,31 @@ STRESS_S3_WAIT_DELAY=60
 
 To change those values use the configure launcher.
 E.g.
-    $ checkbox-snappy.configure OPEN_N_SSID=my-wifi
+    $ checkbox-snappy-classic.configure OPEN_N_SSID=my-wifi
 
 If you __really__ need to change those values using `snap set` command,
 you need to change CAPS to lowercase and underscores to dashes (-).
 
 E.g.
-    $ snap set checkbox-snappy open-n-ssid=my-wifi
+    $ snap set checkbox-snappy-classic open-n-ssid=my-wifi
 """
 
 import os
 import sys
 
 sys.path.append(os.path.expandvars("$SNAP/usr/lib/python3/dist-packages"))
-sitepkgpath = "$SNAP/lib/python{}.{}/site-packages".format(
-    sys.version_info[0], sys.version_info[1])
+sitepkgpath = "$SNAP/lib/python3.8/site-packages"
 sys.path.append(os.path.expandvars(sitepkgpath))
 
 sys.path.append(os.path.expandvars(
+<<<<<<< snap/hooks/configure
     "$SNAP/checkbox-runtime/usr/lib/python3/dist-packages"))
 runtimepath = "$SNAP/checkbox-runtime/lib/python{}.{}/site-packages".format(
     sys.version_info[0], sys.version_info[1])
+=======
+    "/snap/checkbox20/current/usr/lib/python3/dist-packages"))
+runtimepath = "/snap/checkbox20/current/lib/python3.8/site-packages"
+>>>>>>> snap/hooks/configure
 sys.path.append(os.path.expandvars(runtimepath))
 
 try:
@@ -49,6 +53,7 @@ try:
 except ImportError:
     msg = """
 checkbox-support not found!
+<<<<<<< snap/hooks/configure
 You need to connect this snap to the checkbox20 snap.
 
 You can do this with those commands:
@@ -66,4 +71,12 @@ snap connect $SNAP_NAME:provider-certification-client  checkbox20:provider-certi
     """
     print(os.path.expandvars(msg), file=sys.stderr)
     sys.exit(0)
+=======
+You need to install the checkbox20 snap:
+
+snap install checkbox20
+    """
+    print(os.path.expandvars(msg), file=sys.stderr)
+    sys.exit(1)
+>>>>>>> snap/hooks/configure
 refresh_configuration()
diff --git a/snap/hooks/install b/snap/hooks/install
index c893c00..6034082 100755
--- a/snap/hooks/install
+++ b/snap/hooks/install
@@ -1,5 +1,22 @@
 #!/bin/sh
 
 set -e
+<<<<<<< snap/hooks/install
 snapctl set slave=enabled # this is can't be changed until code is updated:
-# https://git.launchpad.net/checkbox-ng/tree/plainbox/impl/session/restart.py#n303
\ No newline at end of file
+# https://git.launchpad.net/checkbox-ng/tree/plainbox/impl/session/restart.py#n303
+=======
+snapctl set slave=enabled
+
+echo "ubuntu ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/checkbox
+sed -i 's|@includedir /etc/sudoers.d|#includedir /etc/sudoers.d|' /etc/sudoers
+
+mkdir -p /etc/polkit-1/localauthority/50-local.d
+cat <<EOF > /etc/polkit-1/localauthority/50-local.d/com.canonical.certification.checkbox.pkla
+[Checkbox]
+Identity=unix-group:sudo
+Action=org.freedesktop.NetworkManager.*
+ResultAny=yes
+ResultInactive=yes
+ResultActive=yes
+EOF
+>>>>>>> snap/hooks/install
diff --git a/snap/hooks/remove b/snap/hooks/remove
new file mode 100755
index 0000000..3360f53
--- /dev/null
+++ b/snap/hooks/remove
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+
+rm -f /etc/sudoers.d/checkbox
+rm -f /etc/polkit-1/localauthority/50-local.d/com.canonical.certification.checkbox.pkla || /bin/true
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index a5f5ea9..426e1a9 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,10 +1,12 @@
-name: checkbox-snappy
+name: checkbox-snappy-classic
 summary: Checkbox tests for Snappy devices
 description: "The provider is a collection of tests to be run on Snappy devices.\n"
 version: '20.17.dev'
 grade: stable
+confinement: classic
 
 base: core20
+<<<<<<< snap/snapcraft.yaml
 
 plugs:
   checkbox-runtime:
@@ -51,21 +53,20 @@ plugs:
     interface: content
     target: $SNAP/providers/plainbox-provider-certification-server
     default-provider: checkbox20
+=======
+>>>>>>> snap/snapcraft.yaml
 
 apps:
   checkbox-cli:
     command-chain: [bin/wrapper_local]
     command: bin/checkbox-cli-wrapper
-    plugs: &standard [home, network-bind, hardware-observe, bluez, bluetooth-control,
-      gpio, modem-manager, mount-observe, network-manager, pulseaudio, serial-port,
-      system-observe, tpm, udisks2]
   test-runner:
     command-chain: [bin/wrapper_local]
     command: bin/test-runner
-    plugs: *standard
   sru:
     command-chain: [bin/wrapper_local]
     command: bin/sru
+<<<<<<< snap/snapcraft.yaml
     plugs: *standard
   client-cert-iot-ubuntucore:
     command-chain: [bin/wrapper_local]
@@ -75,6 +76,14 @@ apps:
     command-chain: [bin/wrapper_local]
     command: bin/test-runner-edgex
     plugs: *standard
+=======
+  client-cert-iot-server:
+    command-chain: [bin/wrapper_local]
+    command: bin/client-cert-iot-server
+  hw-collection:
+    command-chain: [bin/wrapper_local]
+    command: bin/hw-collection
+>>>>>>> snap/snapcraft.yaml
   configure:
     command: bin/configure
   service:
@@ -82,11 +91,14 @@ apps:
     command: bin/checkbox-cli-wrapper service
     daemon: simple
     restart-condition: on-failure
-    plugs: *standard
   shell:
     command-chain: [bin/wrapper_local]
     command: bin/shell-wrapper
-    plugs: *standard
+
+passthrough:
+  hooks:
+    configure:
+      command-chain: [bin/wrapper_local]
 
 passthrough:
   hooks: