Merge ~alextu/pc-enablement/+git/prepare-checkbox-sanity:default-sideload into ~oem-solutions-engineers/pc-enablement/+git/prepare-checkbox-sanity:master

[Alex Tu]

[Alex Tu (alextu)]

https://gitlab.com/alex-tu-cc/prepare-checkbox-sanity/-/pipelines/265929249

[Alex Tu (alextu)]

this 2 MPs is denepcy.
https://code.launchpad.net/~alextu/pc-enablement/+git/prepare-checkbox-sanity/+merge/399204
https://code.launchpad.net/~alextu/plainbox-provider-pc-sanity/+git/plainbox-provider-pc-sanity/+merge/399205

[Yuan-Chen Cheng (ycheng-twn)]

Given just change default value, not add new logic, sample test result can be skipped.

However the author should make sure he did test before merge.

LGTM

review: Approve

diff --git a/usr/sbin/checkbox-run-plan b/usr/sbin/checkbox-run-plan
index 6aef1b7..f2af3f5 100755
--- a/usr/sbin/checkbox-run-plan
+++ b/usr/sbin/checkbox-run-plan
@@ -2,6 +2,7 @@
 
 EXCLUDE=""
 DEF_ENV="/etc/default/prepare-checkbox-sanity.conf"
+DEV_MODE="yes"
 # shellcheck disable=SC1090
 source "$DEF_ENV"
 
@@ -19,7 +20,10 @@ usage: $0 options plan
         -b                  batch mode, which will go all default way.
         -l                  list-bootstrapped for plain
         -s                  dry run. Just prepare all stuff without real run checkbox.
-        --dev               side-load specific plainbox-providers from repositories in /usr/lib/prepare-checkbox-sanity/sideload.json
+        --dev               When provided value "yes" then it prepares the needed providers under /var/tmp/checkbox-providers
+                            to side-load specific plainbox-providers from repositories in /usr/lib/prepare-checkbox-sanity/sideload.json
+                            When provided value "no" then it will not do any additional change for /var/tmp/checkbox-providers. The
+                            default value is "yes".
 
     plan:
         pc_sanity_before_suspend
@@ -87,9 +91,9 @@ do
             DRYRUN="TRUE"
             ;;
         --dev )
-            [ -f /usr/lib/prepare-checkbox-sanity/sideload.json ] || error "/usr/lib/prepare-checkbox-sanity/sideload.json is not there."
-            prepare-checkbox-sanity --side-load-conf /usr/lib/prepare-checkbox-sanity/sideload.json
-            get_exclude_from_side_load
+            shift
+            [ -z "$1" ] && error
+            DEV_MODE="$1"
             ;;
         *)
             [ -z "$1" ] && error
@@ -141,6 +145,12 @@ external_conf="$(cat $CHECKBOX_CONF| grep -v 'checkbox-cli')"
 mkdir -p "$HOME"/.local/share/plainbox
 ln -sf /usr/lib/prepare-checkbox-sanity/machine-manifest.json "$HOME"/.local/share/plainbox
 
+if [ "$DEV_MODE" = "yes" ]; then
+    [ -f /usr/lib/prepare-checkbox-sanity/sideload.json ] || error "/usr/lib/prepare-checkbox-sanity/sideload.json is not there."
+    prepare-checkbox-sanity --side-load-conf /usr/lib/prepare-checkbox-sanity/sideload.json
+    get_exclude_from_side_load
+fi
+
 cat <<EOF > "$HOME/generated_launcher"
 #!/usr/bin/env checkbox-cli
 [launcher]