Merge ~baconyao/checkbox-limerick/+git/checkbox-limerick-classic:adjust-kd240-launcher into ~checkbox-dev/checkbox-limerick/+git/checkbox-limerick-classic:master

[PeiYao Chang]

Change: Integrate ce-oem provider and fix launcher

1. Update the snapcraft.yaml for building snap by snapcraft v7.x
2. Update the wrapper_local for integrating checkbox-provider-ce-oem
3. Update test-runner-kd240 launcher
  - Mark has_hardware_watchdog to be false due to LP#2017477
  - Add some manifests for checkbox-provider-ce-oem
  - Add environment variables for MTD and RTC jobs

The automated test result: https://certification.canonical.com/hardware/202304-31517/submission/314037/test-results/

It shows the checkbox-provider-ce-oem be integrated successfully.

[Vic Liu (zongminl)]

Let's have the following machine manifest set to true as default:
com.canonical.certification::has_hardware_watchdog
com.canonical.qa.ceoem::has_eeprom

review: Needs Fixing

[PeiYao Chang (baconyao)]

> Let's have the following machine manifest set to true as default:
> com.canonical.certification::has_hardware_watchdog
> com.canonical.qa.ceoem::has_eeprom

Fixed, please review it again, thanks.

[Vic Liu (zongminl)]

+1, thank you

review: Approve

diff --git a/launchers/test-runner-kd240 b/launchers/test-runner-kd240
index c1b6fde..ead35d7 100755
--- a/launchers/test-runner-kd240
+++ b/launchers/test-runner-kd240
@@ -15,8 +15,8 @@ filter = com.canonical.qa.limerick::kd240-limerick-classic-22-04
 com.canonical.certification::has_ethernet_adapter = true
 com.canonical.certification::has_usb_storage = true
 com.canonical.certification::has_i2c = true
-com.canonical.certification::has_hardware_watchdog = true
 com.canonical.certification::has_tpm2_chip = true
+com.canonical.certification::has_hardware_watchdog = true
 com.canonical.certification::has_audio_capture = false
 com.canonical.certification::has_audio_loopback_connector = false
 com.canonical.certification::has_audio_playback = false
@@ -33,3 +33,14 @@ com.canonical.certification::has_dp = false
 com.canonical.certification::has_vga = false
 com.canonical.certification::has_dvi = false
 com.canonical.certification::has_hdmi = false
+com.canonical.qa.ceoem::has_buzzer = false
+com.canonical.qa.ceoem::has_eeprom = true
+com.canonical.qa.ceoem::has_gps = false
+com.canonical.qa.ceoem::has_mtd = true
+com.canonical.qa.ceoem::has_otg = false
+com.canonical.qa.ceoem::has_rs485 = true
+com.canonical.qa.ceoem::has_rs485_server = true
+
+[environment]
+TOTAL_MTD_NUM=17
+TOTAL_RTC_NUM=1
diff --git a/launchers/wrapper_local b/launchers/wrapper_local
index 2a65523..44a8f81 100755
--- a/launchers/wrapper_local
+++ b/launchers/wrapper_local
@@ -31,12 +31,15 @@ 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="$SNAP/usr/sbin:$SNAP/sbin:$SNAP/usr/bin:$SNAP/bin:/snap/bin:$PATH"
+export PATH="$SNAP/usr/sbin:$SNAP/sbin:$SNAP/usr/bin:$SNAP/bin:/snap/bin:$PATH:/snap/checkbox-ce-oem/current/usr/bin/:/snap/checkbox-ce-oem/current/usr/sbin"
 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"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/bin:$SNAP/usr/lib:$SNAP/usr/lib/$ARCH:/snap/checkbox-ce-oem/current/usr/lib/aarch64-linux-gnu"
 
 if [ -e $RUNTIME/wrapper_common_classic ]; then
   . $RUNTIME/wrapper_common_classic
+  # Append ce-oem provider
+  export PROVIDERPATH="$PROVIDERPATH:/snap/checkbox-ce-oem/current/providers/checkbox-provider-ce-oem"
 else
   echo "ERROR: no $RUNTIME/wrapper_common_classic found"
   exit 0
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 9acabcb..308405e 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -2,7 +2,7 @@ name: checkbox-limerick-classic
 summary: Checkbox tests for the limerick classic project
 description: |
   Collection of tests to be run on devices that are part of the limerick project
-version: '0.2dev-jammy'
+version: '0.3dev-jammy'
 confinement: classic
 grade: stable
 
@@ -46,13 +46,23 @@ passthrough:
 
 parts:
   checkbox-provider-limerick:
-    plugin: checkbox-provider
+    plugin: dump
     source: https://git.launchpad.net/~checkbox-dev/checkbox-limerick/+git/checkbox-provider-limerick
     source-type: git
     stage-packages:
       - netperf
       - iozone3
     build-attributes: [no-patchelf]
+    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
   parts-meta-info:
     plugin: nil
     build-attributes: [no-patchelf]