Merge ~stanley31/checkbox-iiotg/+git/checkbox-iiotg:230330_add-ce-oem-provider into ~checkbox-dev/checkbox-iiotg/+git/checkbox-iiotg:master

[StanleyHuang]

Add: include the ce-oem provider

    For include the ce-oem-generic provider as a content provider in
    checkbox-iiotg snap, I have made following changes
    1. add a provider-ce-oem plug to connect to ce-oem-generic provider
    2. add lib path into LD_LIBRARY_PATH to access those libraries in
    ce-oem-generic provider, it is for cold-reboot-stress-by-pdu tests

commit 67c93c3d27fd4956c7ecf3836d93748139ee4816 (HEAD -> 230330_add-ce-oem-provider, stanley31/230330_add-ce-oem-provider)
Author: stanley31huang <email address hidden>
Date: Thu Apr 20 11:30:50 2023 +0800

    Fix: remove ipdt provider plug

    remove ipdt provider plug

test results for checkbox-iiotg snap:

automated: https://certification.canonical.com/hardware/202302-31224/submission/309263/
manual: https://certification.canonical.com/hardware/202302-31224/submission/309286/

I think there are some test case issues need to fixed as following links:
- https://github.com/canonical/checkbox-provider-ce-oem/issues/15
- https://github.com/canonical/checkbox-provider-ce-oem/issues/16

[StanleyHuang (stanley31)]

build test snap and upload to
https://drive.google.com/drive/folders/1l4FL-w4QqccgTLAPAw1NkREhQo7KBBPk

we will test it during alpha test

[Vic Liu (zongminl)]

+1, thank you, if everything works fine with austin-charlotte let's merge this

review: Approve

diff --git a/launchers/wrapper_local b/launchers/wrapper_local
index e2f9467..9326de4 100755
--- a/launchers/wrapper_local
+++ b/launchers/wrapper_local
@@ -34,8 +34,9 @@ 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
@@ -45,7 +46,7 @@ else
     echo "Running in configure hook, wrapper_common not required"
   else
     echo "ERROR: no $RUNTIME/wrapper_common found"
-    exit 1
+    exit 0
   fi
 fi
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 6d14e0a..c0b5101 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -21,10 +21,6 @@ plugs:
     interface: content
     target: $SNAP/providers/plainbox-provider-checkbox
     default-provider: checkbox22
-  provider-ipdt:
-    interface: content
-    target: $SNAP/providers/plainbox-provider-ipdt
-    default-provider: checkbox22
   provider-tpm2:
     interface: content
     target: $SNAP/providers/plainbox-provider-tpm2
@@ -37,6 +33,9 @@ plugs:
     interface: content
     target: $SNAP/providers/checkbox-provider-iiotg
     default-provider: checkbox22
+  provider-ce-oem:
+    interface: content
+    target: $SNAP/providers/checkbox-provider-ce-oem
 
 apps:
   checkbox-cli: