Merge ~alextu/pc-enablement/+git/oem-scripts:fix-ubr-debsum into ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master

[Alex Tu]

[Alex Tu (alextu)]

tested stella image on http://10.102.135.50:8080/job/sanity-3-testflinger-dummy-98000-40003-staging/17/

[Alex Tu (alextu)]

These 3 MPs are needed to fix checkbox debsum error on ubuntu recovery images.
https://code.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-oem-image-helper/+merge/413432
https://code.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-misc-for-automation/+merge/413430
https://code.launchpad.net/~alextu/pc-enablement/+git/oem-scripts/+merge/413433

[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.26-73f2963-in-linux-container-focal

[jeremyszu (os369510)]

Although I disagree this patch makes the "MaaS deployment flow" and "injection flow" be unsync, I agree we have a package to maintain the skip-oobe related configurations.

Also that part is ported from somerville and the alextu is the author, it's no reason to reject if alextu did a test already.

In the other hand, the debsum false-alarm is a noise to me.

I think it's ok to merge it and see whether having the problem.

Only one question inline below.

review: Needs Information

[Alex Tu (alextu)]

Because the MaaS deploy way is mainly maintained by the certification team.
So, it would need the certification team to review the needed packages for MaaS way.

short term: sync the packages to skip oob for local sanity and auto sanity from recovery injection.

long term: sync with the way by MaaS deploy.

And also replied inline for the judgment of 1st login.

[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.26-a75ce41-in-linux-container-focal

[Alex Tu (alextu)]

`systemctl is-active ubiquity` can be used to check the 1st login well:

verified on this testing:
http://10.102.135.50:8080/job/sanity-3-testflinger-dummy-98000-40004-staging-testing/3/consoleFull

Self-approved:
 - changes beside a75ce41 has been reviewed by Jeremy
 - a75ce41 is discussed with Jeremy and verified passed.
 - So, I merge it directly to save time.

review: Approve

diff --git a/recovery-from-iso.sh b/recovery-from-iso.sh
index 2d1aa7d..843d9cc 100755
--- a/recovery-from-iso.sh
+++ b/recovery-from-iso.sh
@@ -86,38 +86,18 @@ ubiquity ubuntu-recovery/recovery_type string dev
         sed -i 's%ubiquity/reboot boolean false%ubiquity/reboot boolean true%' ./project.cfg
         sed -i 's%ubiquity/poweroff boolean true%ubiquity/poweroff boolean false%' ./project.cfg
         mv project.cfg $temp_folder/preseed
-        # replace $GIT clone https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/pack-fish.openssh-fossa --depth 1
-        # replace $GIT clone https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-skip-oobe --depth 1
-        # copy from maas. TODO: make it to use from same source.
-        mkdir -p $temp_folder/debs/main
-        pushd $temp_folder/debs/main
-        rm -rf maas_deps
-        git clone --depth 1 -b maas-focal lp:~lyoncore-team/lyoncore/+git/somerville-maas-override maas_deps
-        cd maas_deps
-        git rev-parse --short HEAD
-        rm -f maas-pkgs/oem-fix-misc-cnl-maas-helper*
-        cd ..
-        cp -r maas_deps/maas-pkgs/*.deb .
-        find .
-        popd
-        # TODO: share this with MaaS to use a same source. (e.g. debian package)
-        echo "#!/bin/bash
-. /usr/share/volatile/common.sh
-set -x
-dpkg -i /cdrom/debs/main/*.deb
-apt-get install -fy
-" | tee 32-install-custom-pkgs.sh
-        mkdir -p $temp_folder/scripts/chroot-scripts/os-post
-        mv 32-install-custom-pkgs.sh $temp_folder/scripts/chroot-scripts/os-post
     else
         # get checkbox pkgs and prepare-checkbox
         # get pkgs to skip OOBE
         $GIT clone https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-no-secureboot --depth 1
         $GIT clone https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-skip-storage-selecting --depth 1
         $GIT clone https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/pack-fish.openssh-fossa --depth 1
-        $GIT clone https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-skip-oobe --depth 1
     fi
 
+    # install common tool, so that we can use oem-install to create local repository and install packages.
+    $GIT clone https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-oem-image-helper --depth 1 -b oem-fix-misc-cnl-oem-image-helper_fish
+    # install packages related to skip oobe
+    $GIT clone https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-skip-oobe --depth 1
     # get pkgs for ssh key and skip disk checking.
     $GIT clone https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-misc-for-automation --depth 1 misc_for_automation
 
@@ -186,7 +166,7 @@ push_preseed() {
     $SSH "$user_on_target"@"$target_ip" sudo rm -f /cdrom/SUCCSS_push_preseed
 
     if [ "${ubr}" == "yes" ]; then
-        for folder in debs preseed scripts; do
+        for folder in preseed; do
             $SCP -r "$temp_folder/$folder" "$user_on_target"@"$target_ip":~/push_preseed || $SSH "$user_on_target"@"$target_ip" sudo rm -f push_preseed/SUCCSS_push_preseed
         done
     else
@@ -197,7 +177,7 @@ push_preseed() {
         done
     fi
 
-    for folder in misc_for_automation; do
+    for folder in misc_for_automation oem-fix-misc-cnl-oem-image-helper oem-fix-misc-cnl-skip-oobe; do
         tar -C "$temp_folder"/$folder -zcvf "$temp_folder"/$folder.tar.gz .
         $SCP "$temp_folder/$folder".tar.gz "$user_on_target"@"$target_ip":~
         $SSH "$user_on_target"@"$target_ip" tar -C push_preseed -zxvf $folder.tar.gz || $SSH "$user_on_target"@"$target_ip" sudo rm -f push_preseed/SUCCSS_push_preseed
@@ -271,7 +251,7 @@ prepare() {
 
 poll_recovery_status() {
     while(:); do
-        if $SSH "$user_on_target"@"$target_ip" ubuntu-report show; then
+        if [ "$($SSH "$user_on_target"@"$target_ip"  systemctl is-active ubiquity)" = "inactive" ] ; then
            break
         fi
         sleep 180