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

Proposed by Alex Tu
Status: Merged
Merged at revision: 83c592c7474c275cb4b338b4b66ce33f7d838536
Proposed branch: ~alextu/pc-enablement/+git/pc-sanity-backgroud-photo:eongher
Merge into: ~oem-solutions-engineers/pc-enablement/+git/pc-sanity-backgroud-photo:master
Diff against target: 13 lines (+1/-1)
1 file modified
usr/sbin/pc-sanity-backgroud-photo (+1/-1)
Reviewer Review Type Date Requested Status
Andy Chi Approve
Review via email: mp+410345@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andy Chi (andch) wrote :

wget http://somerville-jenkins.cctu.space:3000/alextu/internal-db/raw/branch/master/202103-28784 -O 11223 || true
--2021-10-18 15:57:55-- http://somerville-jenkins.cctu.space:3000/alextu/internal-db/raw/branch/master/202103-28784
Resolving somerville-jenkins.cctu.space (somerville-jenkins.cctu.space)... 10.102.180.11
Connecting to somerville-jenkins.cctu.space (somerville-jenkins.cctu.space)|10.102.180.11|:3000... connected.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/usr/sbin/pc-sanity-backgroud-photo b/usr/sbin/pc-sanity-backgroud-photo
2index ad2fce4..c7cdf6b 100755
3--- a/usr/sbin/pc-sanity-backgroud-photo
4+++ b/usr/sbin/pc-sanity-backgroud-photo
5@@ -11,7 +11,7 @@ command -v convert || (apt-get update && apt-get install -y imagemagick)
6 eval convert -pointsize 400 -fill yellow -draw \'text 270,250 \"$LOCAL_IP\" \' $IMG_PATH $IMG_PATH
7 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
8
9-wget http://maashooker.cctu.space:3000/alextu/internal-db/raw/branch/master/$CID_TABLE -O /tmp/$CID_TABLE || true
10+wget http://somerville-jenkins.cctu.space:3000/alextu/internal-db/raw/branch/master/$CID_TABLE -O /tmp/$CID_TABLE || true
11 if [ -e "/tmp/$CID_TABLE" ]; then
12 SKU=$(grep ${HOSTNAME##*-} /tmp/$CID_TABLE | awk -F'[:,]' '{print $2}'|xargs)
13 eval convert -pointsize 200 -fill yellow -draw \'text 270,600 \"$SKU\" \' $IMG_PATH $IMG_PATH

Subscribers

People subscribed via source and target branches