Merge ~alextu/pc-enablement/+git/pc-sanity-backgroud-photo:get_hic_cid into ~oem-solutions-engineers/pc-enablement/+git/pc-sanity-backgroud-photo:master

[Alex Tu]

for https://warthogs.atlassian.net/browse/CED-66

[Alex Tu (alextu)]

you can execute this script on any machine listed on http://10.102.180.14:5000
And this is the changed wallpaper for your reference : https://photos.app.goo.gl/P4Q7Xyp6sKhh7zZn7

[Cyrus Lien (cyruslien)]

LGTM.

review: Approve

[Alex Tu (alextu)]

this deb will be included by https://code.launchpad.net/~alextu/pc-enablement/+git/oem-fix-misc-cnl-oem-image-helper/+merge/423227

[PeiYao Chang (baconyao)]

This feature causes the debsums case failed on Stella project due to Wallpaper checking.

review: Needs Fixing

[Clair Lin (clairlin)]

Stella has issue that debsums fail on hp.wallpaper, please refer to the test result https://certification.canonical.com/hardware/202105-29009/submission/265276/test-results/fail/

review: Needs Fixing

diff --git a/debian/changelog b/debian/changelog
index f20048a..0b7ca8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+oem-fix-cnl-pc-sanity-backgroud-photo (0.2.8.2) focal; urgency=medium
+
+  * get cid from hic(http://10.102.180.14:5000/q?db) instead
+  * Replace curl by wget because curl is not default installed, and provide fault tolerance for hic service by retry.
+
+ -- Alex Tu <[e-mail]>  Tue, 24 May 2022 12:58:30 +0800
+
 oem-fix-cnl-pc-sanity-backgroud-photo (0.2.8.1) focal; urgency=medium
 
   * bump version
diff --git a/debian/control b/debian/control
index a0010c6..282672b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,6 @@ Vcs-Browser: https://code.launchpad.net/~oem-solutions-engineers/pc-enablement/+
 
 Package: oem-fix-cnl-pc-sanity-backgroud-photo
 Architecture: all
-Depends: ${misc:Depends}, jq
+Depends: ${misc:Depends}, jq, imagemagick
 Description: oem-fix-cnl-pc-sanity-backgroud-photo, add IP and hostname on screen background
 XB-Modaliases: ${modaliases}
diff --git a/usr/sbin/pc-sanity-backgroud-photo b/usr/sbin/pc-sanity-backgroud-photo
index c7cdf6b..14f35e2 100755
--- a/usr/sbin/pc-sanity-backgroud-photo
+++ b/usr/sbin/pc-sanity-backgroud-photo
@@ -1,19 +1,20 @@
 #!/bin/bash
 set -x
 IMG_PATH="$(echo $(gsettings get org.gnome.desktop.background picture-uri) | sed 's;file://;;')"
-LOCAL_IP=$(ip a | grep inet | awk '{print $2}' | grep 101 | cut -d '/' -f1)
-HOSTNAME=$(cat /etc/hostname)
+ISO_NAME="$(ubuntu-report show | jq '.OEM.DCD' | xargs | awk -F'+' '{print $2"+"$3}')"
 CID_TABLE="cid_clabel_mapping.json"
 eval cp ${IMG_PATH}.backup ${IMG_PATH}
 
-echo $LOCAL_IP
 command -v convert || (apt-get update && apt-get install -y imagemagick)
-eval convert -pointsize 400 -fill yellow -draw \'text 270,250 \"$LOCAL_IP\" \' $IMG_PATH $IMG_PATH
-eval convert -pointsize 200 -fill white -draw \'text 270,400 \"$(cat /etc/hostname | awk -F'-' '{print $NF}') $(ubuntu-report show | jq '.OEM.DCD' | xargs | awk -F'+' '{print $2"+"$3}')\" \' $IMG_PATH $IMG_PATH
-
-wget http://somerville-jenkins.cctu.space:3000/alextu/internal-db/raw/branch/master/$CID_TABLE -O /tmp/$CID_TABLE || true
-if [ -e "/tmp/$CID_TABLE" ]; then
-    SKU=$(grep ${HOSTNAME##*-} /tmp/$CID_TABLE | awk -F'[:,]' '{print $2}'|xargs)
-    eval convert -pointsize 200 -fill yellow -draw \'text 270,600 \"$SKU\" \' $IMG_PATH $IMG_PATH
-fi
+eval convert -pointsize 200 -fill white -draw \'text 330,400 \"$ISO_NAME\" \' $IMG_PATH $IMG_PATH
 
+while [ 1 ]; do
+    for i in `cat /sys/class/net/*/address`; do
+        SKU=$(wget http://10.102.180.14:5000/q?db -O /dev/stdout | jq -r ".[\"$i\"]")
+        if [ -n "$SKU" ]; then
+            eval convert -pointsize 200 -fill yellow -draw \'text 330,600 \"$SKU\" \' $IMG_PATH $IMG_PATH
+            break 2
+        fi
+    done
+    sleep 10
+done