Merge ~alextu/pc-enablement/+git/oem-scripts:trigger-by-cid into ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master

[Alex Tu]

[Alex Tu (alextu)]

https://code.launchpad.net/~alextu/pc-enablement/+git/oem-scripts/+merge/413656

with this change you are able to trigger single machine it's CID.
e.g. trigger both CID 202012-28586 and all machine tagged with alex-test
./trigger-sanity3.sh --cid 202012-28586 -t alex-test --target_img "dell-bto-focal-fossa-next" --image_no "lastSuccessfulBuild" --plan pc-sanity-software-test --inj_recovery "true" --auto_create_bug_assignee "stanley31"

e.g. only trigger CID 202012-28586
./trigger-sanity3.sh --cid 202012-28586 --target_img "dell-bto-focal-fossa-next" --image_no "lastSuccessfulBuild" --plan pc-sanity-software-test --inj_recovery "true" --auto_create_bug_assignee "stanley31"

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
blame: .
badpkg: rules build failed with exit code 2
erroneous package: rules build failed with exit code 2

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.29-dd25ed1-in-linux-container-focal

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
autopkgtest-collect-credentials PASS
autopkgtest-oem-scripts-auto PASS
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bootstrap-meta PASS
bug-bind PASS
get-private-ppa PASS
jq-lp PASS
launchpad-api PASS
lp-bug PASS
oem-meta-packages PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
mir-bug SKIP exit status 77 and marked as skippable
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.29-20bbea4-in-linux-container-focal

[Alex Tu (alextu)]

test result:
$ ./trigger-sanity3.sh --cid 980000-40003 --target_img "dell-bto-focal-fossa-next" --image_no "lastSuccessfulBuild" --plan pc-sanity-software-test --inj_recovery "true" --auto_create_bug_assignee "stanley31"
trigger job sanity-3-testflinger-dummy-980000-40003-staging

# http://10.102.135.50:8080/job/sanity-3-testflinger-dummy-980000-40003-staging/5/ is triggered by then

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
autopkgtest-collect-credentials PASS
autopkgtest-oem-scripts-auto PASS
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bootstrap-meta PASS
bug-bind PASS
get-private-ppa PASS
jq-lp PASS
launchpad-api PASS
lp-bug PASS
oem-meta-packages PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
mir-bug SKIP exit status 77 and marked as skippable
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.29-07bf0ba-in-linux-container-focal

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
autopkgtest-collect-credentials PASS
autopkgtest-oem-scripts-auto PASS
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bootstrap-meta PASS
bug-bind PASS
get-private-ppa PASS
jq-lp PASS
launchpad-api PASS
lp-bug PASS
oem-meta-packages PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
mir-bug SKIP exit status 77 and marked as skippable
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.29-07bf0ba-in-linux-container-focal

[Dirk Su (dirksu)]

Usage help string use --CID, the real command is --cid, may need to make it consistent

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
autopkgtest-collect-credentials PASS
autopkgtest-oem-scripts-auto PASS
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bootstrap-meta PASS
bug-bind PASS
get-private-ppa PASS
jq-lp PASS
launchpad-api PASS
lp-bug PASS
oem-meta-packages PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
mir-bug SKIP exit status 77 and marked as skippable
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-1.29-2da475a-in-linux-container-focal

[Dirk Su (dirksu)]

LGTM

review: Approve

[Cyrus Lien (cyruslien)]

review: Approve

diff --git a/trigger-sanity3.sh b/trigger-sanity3.sh
index 6098b80..0469ceb 100755
--- a/trigger-sanity3.sh
+++ b/trigger-sanity3.sh
@@ -24,7 +24,7 @@ usage() {
 cat << EOF
 Usage:
 $(basename "$0") -t <TAG> --dry-run
-$(basename "$0") -t <TAG> -p <PROJECT> -u <USER> -k <API_TOKEN>
+$(basename "$0") [-t <TAG>| --cid <CID> ] -p <PROJECT> -u <USER> -k <API_TOKEN>
             [--exclude_task <TASK_TO_EXCLUDE>]
             [--target_img <TARGET_IMAGE>]
             [--image_no <IMAGE_NO>]
@@ -38,6 +38,7 @@ Options:
     -p|--project                Project name, default is dummy
     -u|--user                   Jenkins server username
     -k|--token                  Jenkins server user API token
+    --cid                       The CID that you would like to run sanity-3, ex: 202012-28586
     --exclude_task              sanity-3 parameter exclude_task
     --target_img                sanity-3 parameter target_image
                                 (e.g. pc-stella-cmit-focal-amd64)
@@ -75,7 +76,8 @@ trigger_sanity_3() {
     local silent
     [ "$verbose" -eq 0 ] && silent="-s"
 	#get mapping of tag to skus
-    skus=$(curl ${silent} http://"$HIC_ADDR"/q?db=tag | jq -r --arg TAG "$tag" 'with_entries(select(.value | startswith($TAG))) | keys | @sh' | tr -d \')
+    [ -z "$tag" ] || skus=$(curl ${silent} http://"$HIC_ADDR"/q?db=tag | jq -r --arg TAG "$tag" 'with_entries(select(.value | startswith($TAG))) | keys | @sh' | tr -d \')
+    [ -z "$CID" ] || skus="$skus $CID"
 
     for i in $(seq 1 10); do
         ONLINE_IPS=$(curl ${silent} http://"$HIC_ADDR"/q?db=ipo)
@@ -176,6 +178,10 @@ main() {
                 shift
                 auto_create_bug_assignee="$1"
             ;;
+            --cid)
+                shift
+                CID=$1
+            ;;
             *)
                 echo "Not recognize $1"
                 usage
@@ -184,8 +190,7 @@ main() {
         shift
     done
     if [ -z "$tag" ];then
-        echo "Need to input tag"
-        usage
+        [ -n "$CID" ] || (echo "Need to input tag or CID"; usage)
     fi
     if [ $dry_run -eq 0 ];then
         if [ -z "$user" ];then