Merge ~zongminl/checkbox-limerick/+git/checkbox-limerick:fix-snapcraft7-build-error into ~zongminl/checkbox-limerick/+git/checkbox-limerick:master

[Vic Liu]

Fix: Add required packages to build-packages to fix snapcraft 7.x build error

Build log: https://launchpad.net/~zongminl/+snap/snapcraft7-checkbox-limerick/+build/2342754/+files/buildlog_snap_ubuntu_jammy_arm64_snapcraft7-checkbox-limerick_BUILDING.txt.gz

Unmerged commits

27d4a51... by Vic Liu on 2024-01-02

Fix: Add required packages to build-packages to fix snapcraft 7.x build error

747d05f... by Ubuntu <email address hidden> on 2023-11-20

Merge #455844 from ~liaou3/checkbox-limerick/+git/checkbox-limerick:fix_typo

Fix typo: from intliotg to limerick

0ea92fc... by Vincent Liao on 2023-11-20

Fix typo: from intliotg to limerick

6a42fe8... by Ubuntu <email address hidden> on 2023-10-12

Merge #452626 from ~liaou3/checkbox-limerick/+git/checkbox-limerick:modify_core_testplan

Modify project checkbox to fit UC22 tests and snapcraft 7.x

1285c50... by Vincent Liao on 2023-10-03

Modify all to fit the current UC22 test plan

cefcb87... by Vic Liu on 2022-04-07

Add: Launcher for KR260 platform

b27a950... by Vic Liu on 2021-11-15

Remove: Remove unused launchers

b65f84e... by Vic Liu on 2021-11-15

Add: Add launchers for zcu10x and kv260 platforms

diff --git a/config/config_vars b/config/config_vars
index d06bf07..e25f004 100644
--- a/config/config_vars
+++ b/config/config_vars
@@ -2,23 +2,32 @@
 WIFI_INTERFACE=wlan0
 # WATCHDOG_KERNEL_MOD=iTCO_wdt
 # ALSADEVICE=hw:CARD=bytrt5660,DEV=0
-OPEN_N_SSID=ubuntu-cert-n-open
-OPEN_BG_SSID=ubuntu-cert-bg-open
-OPEN_AC_SSID=ubuntu-cert-ac-open
-WPA_N_SSID=ubuntu-cert-n-wpa
-WPA_BG_SSID=ubuntu-cert-bg-wpa
-WPA_AC_SSID=ubuntu-cert-ac-wpa
+OPEN_N_SSID=ubuntu-cert-n-open-tpelab
+OPEN_BG_SSID=ubuntu-cert-bg-open-tpelab
+OPEN_AC_SSID=ubuntu-cert-ac-open-tpelab
+OPEN_AX_SSID=ubuntu-cert-ax-open-tpelab
+WPA_N_SSID=ubuntu-cert-n-wpa-tpelab
+WPA_BG_SSID=ubuntu-cert-bg-wpa-tpelab
+WPA_AC_SSID=ubuntu-cert-ac-wpa-tpelab
+WPA_AX_SSID=ubuntu-cert-ax-wpa-tpelab
+WPA3_AX_SSID=ubuntu-cert-ax-wpa3-tpelab
 WPA_N_PSK=insecure
 WPA_BG_PSK=insecure
 WPA_AC_PSK=insecure
-OBEX_TARGET=00:02:72:C5:F9:1F
+WPA_AX_PSK=insecure
+WPA3_AX_PSK=insecure
+BTDEVADDR=C0:B5:D7:C1:74:38
+# obex server in office: C0:B5:D7:C1:74:38
+# obex server in lab: 28:3A:4D:46:79:C0, 7C:B2:7D:4B:14:95
 WWAN_APN=internet
 WWAN_NET_IF=ppp0
 WWAN_CONTROL_IF=ttyACM3
-STRESS_BOOT_ITERATIONS=100
-STRESS_S3_ITERATIONS=100
+STRESS_BOOT_ITERATIONS=30
+STRESS_S3_ITERATIONS=30
 STRESS_S4_ITERATIONS=100
-TEST_TARGET_IPERF=10.101.47.93
+TEST_TARGET_IPERF=10.102.88.220,10.102.182.100,10.102.182.137
+# iperf server in office: 10.102.88.220
+# iperf server in lab: 10.102.182.100, 10.102.182.137
 STRESS_S4_WAIT_DELAY=120
 STRESS_S4_SLEEP_DELAY=60
 STRESS_S3_SLEEP_DELAY=60
@@ -29,4 +38,4 @@ WIFI_AP_SETUPTIME=30
 WWAN_SETUPTIME=30
 TPM2TOOLS_TCTI_NAME=device
 TPM2TOOLS_DEVICE_FILE=/dev/tpm0
-STORE_ID=foobar
+MODEL_GRADE=signed
diff --git a/launchers/configure b/launchers/configure
index cec1d8a..4970a5f 100755
--- a/launchers/configure
+++ b/launchers/configure
@@ -26,18 +26,15 @@ try:
 except ImportError:
     msg = """
 checkbox-support not found!
-You need to connect this snap to the checkbox20 snap.
+You need to connect this snap to the checkbox22 snap.
 
 You can do this with those commands:
 
-snap connect $SNAP_NAME:checkbox-runtime  checkbox20:checkbox-runtime
-snap connect $SNAP_NAME:provider-resource checkbox20:provider-resource
-snap connect $SNAP_NAME:provider-checkbox checkbox20:provider-checkbox
-snap connect $SNAP_NAME:provider-snappy   checkbox20:provider-snappy
-snap connect $SNAP_NAME:provider-ipdt     checkbox20:provider-ipdt
-snap connect $SNAP_NAME:provider-docker   checkbox20:provider-docker
-snap connect $SNAP_NAME:provider-tpm2     checkbox20:provider-tpm2
-snap connect $SNAP_NAME:provider-edgex    checkbox20:provider-edgex
+snap connect $SNAP_NAME:checkbox-runtime  checkbox22:checkbox-runtime
+snap connect $SNAP_NAME:provider-resource checkbox22:provider-resource
+snap connect $SNAP_NAME:provider-checkbox checkbox22:provider-checkbox
+snap connect $SNAP_NAME:provider-tpm2     checkbox22:provider-tpm2
+snap connect $SNAP_NAME:provider-certification-client checkbox22:provider-certification-client
     """
     print(os.path.expandvars(msg), file=sys.stderr)
     sys.exit(1)
diff --git a/launchers/test-runner-automated b/launchers/test-runner-automated
deleted file mode 100755
index 7d8ef3b..0000000
--- a/launchers/test-runner-automated
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env checkbox-cli-wrapper
-[launcher]
-app_id = com.canonical.qa.limerick:checkbox
-launcher_version = 1
-stock_reports = text, submission_files
-
-[test plan]
-unit = com.canonical.qa.limerick::limerick-automated
-forced = yes
-
-[test selection]
-forced = yes
-
-[ui]
-type = silent
-auto_retry = no
-max_attempts = 4
-delay_before_retry = 30
-
diff --git a/launchers/test-runner b/launchers/test-runner-kr260
similarity index 54%
rename from launchers/test-runner
rename to launchers/test-runner-kr260
index c8292ab..8c81dbc 100755
--- a/launchers/test-runner
+++ b/launchers/test-runner-kr260
@@ -5,9 +5,9 @@ launcher_version = 1
 stock_reports = text, submission_files, certification
 
 [test plan]
-unit = com.canonical.qa.limerick::limerick
-filter = com.canonical.qa.limerick::limerick
-        com.canonical.qa.limerick::limerick-manual
-        com.canonical.qa.limerick::limerick-automated
-        com.canonical.qa.limerick::limerick-stress
+unit = com.canonical.qa.limerick::kr260-limerick
+filter = com.canonical.qa.limerick::kr260-limerick
+        com.canonical.qa.limerick::kr260-limerick-manual
+        com.canonical.qa.limerick::kr260-limerick-automated
+        com.canonical.qa.limerick::kr260-limerick-stress
 
diff --git a/launchers/test-runner-kv260 b/launchers/test-runner-kv260
new file mode 100755
index 0000000..923d19f
--- /dev/null
+++ b/launchers/test-runner-kv260
@@ -0,0 +1,13 @@
+#!/usr/bin/env checkbox-cli-wrapper
+[launcher]
+app_id = com.canonical.qa.limerick:checkbox
+launcher_version = 1
+stock_reports = text, submission_files, certification
+
+[test plan]
+unit = com.canonical.qa.limerick::kv260-limerick
+filter = com.canonical.qa.limerick::kv260-limerick
+        com.canonical.qa.limerick::kv260-limerick-manual
+        com.canonical.qa.limerick::kv260-limerick-automated
+        com.canonical.qa.limerick::kv260-limerick-stress
+
diff --git a/launchers/test-runner-zcu10x b/launchers/test-runner-zcu10x
new file mode 100755
index 0000000..2d61ea4
--- /dev/null
+++ b/launchers/test-runner-zcu10x
@@ -0,0 +1,13 @@
+#!/usr/bin/env checkbox-cli-wrapper
+[launcher]
+app_id = com.canonical.qa.limerick:checkbox
+launcher_version = 1
+stock_reports = text, submission_files, certification
+
+[test plan]
+unit = com.canonical.qa.limerick::zcu10x-limerick
+filter = com.canonical.qa.limerick::zcu10x-limerick
+        com.canonical.qa.limerick::zcu10x-limerick-manual
+        com.canonical.qa.limerick::zcu10x-limerick-automated
+        com.canonical.qa.limerick::zcu10x-limerick-stress
+
diff --git a/launchers/wrapper_local b/launchers/wrapper_local
index 7df956e..9326de4 100755
--- a/launchers/wrapper_local
+++ b/launchers/wrapper_local
@@ -21,11 +21,11 @@ esac
 if [ -d $SNAP/checkbox-runtime ]; then
   RUNTIME=$SNAP/checkbox-runtime
   if [ ! -d $RUNTIME/usr ]; then
-    echo "You need to connect this snap to the checkbox20 snap."
+    echo "You need to connect this snap to the checkbox22 snap."
     echo ""
     echo "You can do this with those commands:"
-    echo "snap install checkbox20"
-    echo "snap connect $SNAP_NAME:checkbox-runtime checkbox20:checkbox-runtime"
+    echo "snap install checkbox22"
+    echo "snap connect $SNAP_NAME:checkbox-runtime checkbox22:checkbox-runtime"
     exit 1
   fi
 fi
@@ -34,14 +34,20 @@ export LC_ALL=C.UTF-8
 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"
 export GI_TYPELIB_PATH=$SNAP/usr/lib/girepository-1.0:$SNAP/usr/lib/$ARCH/girepository-1.0
-export PATH="$PATH:$SNAP/usr/bin:$SNAP/usr/sbin:$SNAP/sbin:/snap/bin"
+export PATH="$PATH:$SNAP/usr/bin:$SNAP/usr/sbin:$SNAP/sbin:/snap/bin:/snap/checkbox-ce-oem/current/usr/bin/:/snap/checkbox-ce-oem/current/usr/sbin"
 export PYTHONPATH="$SNAP/usr/lib/python3/dist-packages:$PYTHONPATH"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/snap/checkbox-ce-oem/current/usr/lib/aarch64-linux-gnu"
 
 if [ -e $RUNTIME/wrapper_common ]; then
   . $RUNTIME/wrapper_common
 else
-  echo "ERROR: no $RUNTIME/wrapper_common found"
-  exit 1
+  CGROUP_NAME=$(cat /proc/self/cgroup | grep -e "^1:name")
+  if [[ "$CGROUP_NAME" == *"hook.configure"* ]]; then
+    echo "Running in configure hook, wrapper_common not required"
+  else
+    echo "ERROR: no $RUNTIME/wrapper_common found"
+    exit 0
+  fi
 fi
 
 exec "$@"
diff --git a/snap/hooks/configure b/snap/hooks/configure
index 508c6f3..aaf099e 100755
--- a/snap/hooks/configure
+++ b/snap/hooks/configure
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2017-2020 Canonical Ltd.
+# Copyright 2017-2023 Canonical Ltd.
 # All rights reserved.
 
 """
@@ -46,18 +46,15 @@ try:
 except ImportError:
     msg = """
 checkbox-support not found!
-You need to connect this snap to the checkbox20 snap.
+You need to connect this snap to the checkbox22 snap.
 
 You can do this with those commands:
 
-snap connect $SNAP_NAME:checkbox-runtime  checkbox20:checkbox-runtime
-snap connect $SNAP_NAME:provider-resource checkbox20:provider-resource
-snap connect $SNAP_NAME:provider-checkbox checkbox20:provider-checkbox
-snap connect $SNAP_NAME:provider-snappy   checkbox20:provider-snappy
-snap connect $SNAP_NAME:provider-ipdt     checkbox20:provider-ipdt
-snap connect $SNAP_NAME:provider-docker   checkbox20:provider-docker
-snap connect $SNAP_NAME:provider-tpm2     checkbox20:provider-tpm2
-snap connect $SNAP_NAME:provider-edgex    checkbox20:provider-edgex
+snap connect $SNAP_NAME:checkbox-runtime  checkbox22:checkbox-runtime
+snap connect $SNAP_NAME:provider-resource checkbox22:provider-resource
+snap connect $SNAP_NAME:provider-checkbox checkbox22:provider-checkbox
+snap connect $SNAP_NAME:provider-tpm2     checkbox22:provider-tpm2
+snap connect $SNAP_NAME:provider-certification-client checkbox22:provider-certification-client
     """
     print(os.path.expandvars(msg), file=sys.stderr)
     sys.exit(0)
diff --git a/snap/plugins/checkbox_provider.py b/snap/plugins/checkbox_provider.py
index bf51895..ea4581e 100644
--- a/snap/plugins/checkbox_provider.py
+++ b/snap/plugins/checkbox_provider.py
@@ -1,6 +1,6 @@
 # -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
 #
-# Copyright (C) 2016-2020 Canonical Ltd
+# Copyright (C) 2016-2023 Canonical Ltd
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -39,6 +39,8 @@ class PluginImpl(PluginV2):
             self.build_snaps.add("checkbox18")
         if self.project.info.base == "core20":
             self.build_snaps.add("checkbox20")
+        if self.project.info.base == "core22":
+            self.build_snaps.add("checkbox22")
         return self.build_snaps
 
     def get_build_packages(self) -> Set[str]:
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index abe4420..edfb63a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -2,29 +2,36 @@ name: checkbox-limerick
 summary: Checkbox tests for the limerick project
 description: |
   Collection of tests to be run on devices that are part of the limerick project
-version: '0.1.dev'
+version: '0.2.dev'
 confinement: strict
 grade: stable
 
-base: core20
+base: core22
 
 plugs:
   checkbox-runtime:
     interface: content
     target: $SNAP/checkbox-runtime
-    default-provider: checkbox20
+    default-provider: checkbox22
   provider-resource:
     interface: content
     target: $SNAP/providers/plainbox-provider-resource
-    default-provider: checkbox20
+    default-provider: checkbox22
   provider-checkbox:
     interface: content
     target: $SNAP/providers/plainbox-provider-checkbox
-    default-provider: checkbox20
-  provider-snappy:
+    default-provider: checkbox22
+  provider-tpm2:
     interface: content
-    target: $SNAP/providers/plainbox-provider-snappy
-    default-provider: checkbox20
+    target: $SNAP/providers/plainbox-provider-tpm2
+    default-provider: checkbox22
+  provider-certification-client:
+    interface: content
+    target: $SNAP/providers/plainbox-provider-certification-client
+    default-provider: checkbox22
+  provider-ce-oem:
+    interface: content
+    target: $SNAP/providers/checkbox-provider-ce-oem
 
 apps:
   checkbox-cli:
@@ -46,9 +53,17 @@ apps:
     command-chain: [bin/wrapper_local]
     command: bin/shell-wrapper
     plugs: *standard
-  test-runner:
+  test-runner-zcu10x:
+    command-chain: [bin/wrapper_local]
+    command: bin/test-runner-zcu10x
+    plugs: *standard
+  test-runner-kv260:
     command-chain: [bin/wrapper_local]
-    command: bin/test-runner
+    command: bin/test-runner-kv260
+    plugs: *standard
+  test-runner-kr260:
+    command-chain: [bin/wrapper_local]
+    command: bin/test-runner-kr260
     plugs: *standard
 
 passthrough:
@@ -58,9 +73,23 @@ passthrough:
 
 parts:
   checkbox-provider-limerick:
-    plugin: checkbox-provider
-    source: git://git.launchpad.net/~checkbox-dev/checkbox-limerick/+git/checkbox-provider-limerick
+    plugin: dump
+    source: https://git.launchpad.net/~checkbox-dev/checkbox-limerick/+git/checkbox-provider-limerick
     source-type: git
+    build-snaps:
+      - checkbox22
+    override-build: |
+      export PYTHONPATH=/snap/checkbox22/current/lib/python3.10/site-packages/
+      for path in $(find "/snap/checkbox22/current/providers/" -mindepth 1 -maxdepth 1 -type d); do export PROVIDERPATH=$path${PROVIDERPATH:+:$PROVIDERPATH}; done
+      python3 manage.py validate
+      python3 manage.py build
+      python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-limerick --root="$SNAPCRAFT_PART_INSTALL"
+    build-packages:
+      - python3-jinja2
+      - python3-xlsxwriter
+      - python3-packaging
+      - python3-urwid
+      - python3-requests-oauthlib
   parts-meta-info:
     plugin: nil
     override-build: |