Merge ~alextu/pc-enablement/+git/oem-scripts:steps-to-support-ubuntu-recovery-injection into ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master

[Alex Tu]

ff91625... by Alex Tu on 2021-05-03

do_recovery based on project code name

[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 PASS
get-private-ppa PASS
jq-lp PASS
launchpad-api PASS
lp-bug PASS
mir-bug FAIL non-zero exit status 1
oem-meta-packages PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
git-url-insteadof-setting FAIL non-zero exit status 128
recovery-from-iso.sh PASS
mir-bug-verification FAIL stderr: E: Unable to locate package oem-somerville-maester-meta

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts-0.88-ff91625-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
bug-bind PASS
get-private-ppa PASS
jq-lp PASS
launchpad-api PASS
lp-bug PASS
mir-bug FAIL non-zero exit status 1
oem-meta-packages PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
git-url-insteadof-setting FAIL non-zero exit status 128
recovery-from-iso.sh PASS
mir-bug-verification PASS

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

Unmerged commits

ff91625... by Alex Tu on 2021-05-03

do_recovery based on project code name

f9bc06f... by Alex Tu on 2021-05-03

prepare oem-install for machines with ubuntu-recovery

diff --git a/recovery-from-iso.sh b/recovery-from-iso.sh
index c8a5b1c..9248e24 100755
--- a/recovery-from-iso.sh
+++ b/recovery-from-iso.sh
@@ -10,7 +10,7 @@ SCP="scp -o StrictHostKeyChecking=no"
 #TAR="tar -C $temp_folder"
 temp_folder="$(mktemp -d -p "$PWD")"
 GIT="git -C $temp_folder"
-
+oem_project=""
 clear_all() {
     rm -rf "$temp_folder"
 }
@@ -58,6 +58,7 @@ download_preseed() {
     $GIT clone https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-skip-oobe --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-oem-image-helper --depth 1 -b oem-fix-misc-cnl-oem-image-helper_fish
 
     # 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
@@ -123,6 +124,9 @@ EOF
 }
 prepare() {
     echo "prepare"
+    ssh -o StrictHostKeyChecking=no "$user_on_target"@"$target_ip" wget https://gitlab.com/canonical-mainstream/plainbox-provider-pc-sanity/-/raw/master/bin/get-oem-info.sh
+    oem_project="$(ssh -o StrictHostKeyChecking=no "$user_on_target"@"$target_ip" bash get-oem-info.sh --oem-codename)"
+    [ -n "$oem_project" ] || exit 1
     inject_recovery_iso
     inject_preseed
 }
@@ -137,7 +141,23 @@ poll_recovery_status() {
 }
 
 do_recovery() {
-    ssh -o StrictHostKeyChecking=no "$user_on_target"@"$target_ip" sudo dell-restore-system -y &
+    if [ "$oem_project"="stella" ]; then
+        script_on_target_machine="do-recovery.sh"
+cat <<EOF > "$temp_folder/$script_on_target_machine"
+#!/bin/bash
+set -x
+sudo efibootmgr -n \$(efibootmgr | grep Recovery | cut -c 5-8)
+sudo reboot
+EOF
+    scp -o StrictHostKeyChecking=no "$temp_folder/$script_on_target_machine" "$user_on_target"@"$target_ip":~/
+    ssh -o StrictHostKeyChecking=no "$user_on_target"@"$target_ip" chmod +x "\$HOME/$script_on_target_machine"
+    ssh -o StrictHostKeyChecking=no "$user_on_target"@"$target_ip" "\$HOME/$script_on_target_machine"
+    elif "$oem_project"="somerville"; then
+        ssh -o StrictHostKeyChecking=no "$user_on_target"@"$target_ip" sudo dell-restore-system -y &
+    else
+        echo "ERROR: no oem project matched."
+        exit 1
+    fi
     sleep 300 # sleep to make sure the target system has been rebooted to recovery mode.
     poll_recovery_status
 }