Merge ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:recovery-from-iso-debsums-fix into ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master

[Yao Wei]

recovery-from-iso.sh: remove cert-sru-oobe-pressed and reinstall dell-recovery after installaion

[Yao Wei (medicalwei)]

Log: https://pastebin.canonical.com/p/c3XXFcHTjB/

[Shih-Yuan Lee (fourdollars)]

Please reuse https://git.launchpad.net/plainbox-provider-pc-sanity/tree/bin/check_grub_boothole.sh#n137 and https://git.launchpad.net/plainbox-provider-pc-sanity/tree/bin/check_grub_boothole.sh#n139 to find the recovery partition of dell-recovery and ubuntu-recovery.

review: Needs Fixing

[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
bug-bind FAIL non-zero exit status 1
get-private-ppa FAIL non-zero exit status 1
jq-lp PASS
launchpad-api FAIL non-zero exit status 1
lp-bug FAIL non-zero exit status 4
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
bootstrap-meta FAIL non-zero exit status 1
mir-bug FAIL non-zero exit status 1
oem-meta-packages 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.42-4cb8ac6-in-linux-container-jammy

Unmerged commits

4cb8ac6... by Yao Wei on 2022-06-15

recovery-from-iso.sh: remove cert-sru-oobe-pressed and reinstall dell-recovery after installaion

diff --git a/recovery-from-iso.sh b/recovery-from-iso.sh
index e9812f4..5172637 100755
--- a/recovery-from-iso.sh
+++ b/recovery-from-iso.sh
@@ -16,9 +16,6 @@ enable_sb="no"
 
 clear_all() {
     rm -rf "$temp_folder"
-    # remove Ubiquity in the end to match factory and Stock Ubuntu image behavior.
-    # and it also workaround some debsum error from ubiquity.
-    ssh -o StrictHostKeyChecking=no "$user_on_target"@"$target_ip" sudo apt-get -o DPkg::Lock::Timeout=-1 purge -y ubiquity
 }
 trap clear_all EXIT
 # shellcheck disable=SC2046
@@ -442,6 +439,29 @@ do_recovery() {
     poll_recovery_status
 }
 
+post_install() {
+    workaround_script="workaround_debsums.sh"
+    cat <<EOF > "$temp_folder/$workaround_script"
+#!/bin/bash
+set -x
+
+# Working around known debsums discrepancies:
+# Purge packages (ubiquity, cert-sru-oobe-preseed) that is not needed
+sudo apt-get -o DPkg::Lock::Timeout=-1 purge -y ubiquity cert-sru-oobe-preseed
+
+# Reinstall dell-recovery
+sudo umount /cdrom || true
+recover_p=\$(lsblk -l | grep efi | cut -d ' ' -f 1 | sed 's/.$/2'/)
+sudo mount /dev/\$recover_p /cdrom
+dell_recovery_debs=(/cdrom/debs/dell-recovery_*)
+sudo apt -o DPkg::Lock::Timeout=-1 install --reinstall -y "\${dell_recovery_debs[@]}"
+sudo umount /cdrom
+EOF
+    $SCP "$temp_folder"/"$workaround_script" "$user_on_target"@"$target_ip":~/
+    $SSH "$user_on_target"@"$target_ip" chmod +x "\$HOME/$workaround_script"
+    $SSH "$user_on_target"@"$target_ip" "\$HOME/$workaround_script"
+}
+
 main() {
     while [ $# -gt 0 ]
     do
@@ -503,7 +523,7 @@ main() {
     done
     prepare
     do_recovery
-    clear_all
+    post_install
 }
 
 if [ "${BASH_SOURCE[0]}" = "$0" ]; then