Merge ~alextu/pc-enablement/+git/prepare-checkbox-sanity:lp1909974-conf-in-checkbox-remote into ~oem-solutions-engineers/pc-enablement/+git/prepare-checkbox-sanity:master

[Alex Tu]

[Alex Tu (alextu)]

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

[Alex Tu (alextu)]

ubuntu@CANONICALID:~$ checkbox-run-plan -s test
== you selected test ==
do you want to set the path of checkbox.conf? (refer to https://checkbox.readthedocs.io/en/latest/launcher-tutorial.html)
/usr/sbin/checkbox-run-plan: line 103: read: `(Y/N):': not a valid identifier
Keep the checkbox.conf as default from /etc/default/prepare-checkbox-sanity.conf
--2021-01-04 17:44:47-- http://maasbridge.cctu.space:3000/alextu/internal-db/raw/branch/master/checkbox.conf
Resolving maasbridge.cctu.space (maasbridge.cctu.space)... 192.168.101.221
Connecting to maasbridge.cctu.space (maasbridge.cctu.space)|192.168.101.221|:3000... failed: Connection timed out.
Retrying.

--2021-01-04 17:44:53-- (try: 2) http://maasbridge.cctu.space:3000/alextu/internal-db/raw/branch/master/checkbox.conf
Connecting to maasbridge.cctu.space (maasbridge.cctu.space)|192.168.101.221|:3000... failed: Connection timed out.
Retrying.

--2021-01-04 17:45:00-- (try: 3) http://maasbridge.cctu.space:3000/alextu/internal-db/raw/branch/master/checkbox.conf
Connecting to maasbridge.cctu.space (maasbridge.cctu.space)|192.168.101.221|:3000... failed: Connection timed out.
Giving up.

========= the checkbox launcher will be run =========
#!/usr/bin/env checkbox-cli
[launcher]
launcher_version = 1

[test plan]
unit = com.canonical.certification::test
forced = yes

[test selection]
forced = yes
exclude =

[ui]
type = silent

[daemon]
normal_user = ubuntu

[transport:example_local_file]
type = file
path = /tmp/c3-local-submission.tar.xz

[exporter:example_tar]
unit = com.canonical.plainbox::tar

[report:report_example_file]
transport = example_local_file
exporter = example_tar
forced = yes

[environment]
ROUTERS = multiple
TRANSFER_SERVER = cdimage.ubuntu.com
=====================================================

[Alex Tu (alextu)]

passed pipline testing and local testing.
According to jeremyszu not yet have time to review it.
So, I will merge it directly.

diff --git a/usr/lib/prepare-checkbox-sanity/fall-back-checkbox.conf b/usr/lib/prepare-checkbox-sanity/fall-back-checkbox.conf
index f705efa..c72feee 100644
--- a/usr/lib/prepare-checkbox-sanity/fall-back-checkbox.conf
+++ b/usr/lib/prepare-checkbox-sanity/fall-back-checkbox.conf
@@ -1,8 +1,4 @@
 #!/usr/bin/env checkbox-cli
-[launcher]
-launcher_version = 1
-stock_reports = text, submission_files
-
 [transport:example_local_file]
 type = file
 path = /tmp/c3-local-submission.tar.xz
diff --git a/usr/sbin/checkbox-run-plan b/usr/sbin/checkbox-run-plan
index bf125cd..395004e 100755
--- a/usr/sbin/checkbox-run-plan
+++ b/usr/sbin/checkbox-run-plan
@@ -128,6 +128,7 @@ if [ -z "${PLAN##pc*}" ]; then
     done
 fi
 
+external_conf="$(cat $CHECKBOX_CONF| grep -v 'checkbox-cli')"
 # prepare needed user environment
 mkdir -p "$HOME"/.local/share/plainbox
 ln -sf /usr/lib/prepare-checkbox-sanity/machine-manifest.json "$HOME"/.local/share/plainbox
@@ -137,9 +138,6 @@ cat <<EOF > "$HOME/generated_launcher"
 [launcher]
 launcher_version = 1
 
-[config]
-config_filename = $CHECKBOX_CONF
-
 [test plan]
 unit = com.canonical.certification::$PLAN
 forced = yes
@@ -153,6 +151,8 @@ type = silent
 
 [daemon]
 normal_user = $USER
+
+$external_conf
 EOF
 echo "========= the checkbox launcher will be run ========="
 cat "$HOME/generated_launcher"