Merge ~dirksu/pc-enablement/+git/oem-scripts:remove_oem_image_helper into ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master

[Dirk Su]

Remove pack-fish.openssh-fossa and oem-image-helper from preseed

openssh will install in oem-fix-misc-cnl-skip-oobe. oem-image-helper may caused old somerville iso which contain previous verison oem-image-helper fail to inject.

Tested with Tributo ADL with following scenario
1. jammy alloem-init to fossa-tentacool: good
2. jammy alloem-init to jellyfish-tentacool: good
3. jellyfish-tentacool to fossa-tentacool: good
4. fossa-tentacool to jellyfish-tentacool: good

[Andy Chi (andch)]

Checked from the source of auto-prime-select (https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-oem-image-helper/tree/usr/sbin/auto-prime-select), which is not used in Jammy image now.
I think it's safe to remove oem-image-helper. Can we test the scenario which cert team encountered? Just want to make sure everything works on Jammy and Focal.

review: Needs Information

[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
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
bootstrap-meta PASS
mir-bug PASS
oem-meta-packages PASS
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.61-3b2ecb5-in-linux-container-jammy

[Andy Chi (andch)]

Thanks for testing :)

review: Approve

diff --git a/recovery-from-iso.sh b/recovery-from-iso.sh
index 73ea260..7abce99 100755
--- a/recovery-from-iso.sh
+++ b/recovery-from-iso.sh
@@ -158,11 +158,8 @@ ubiquity ubuntu-recovery/recovery_type string dev
             $GIT clone  https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-install-sbhelper --depth 1
         fi
         $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
     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
     skip_oobe_branch="master"
     if [ -n "$ubuntu_release" ]; then
@@ -231,7 +228,6 @@ push_preseed() {
         $SCP -r "$temp_folder/preseed" "$user_on_target"@"$target_ip":~/push_preseed || $SSH "$user_on_target"@"$target_ip" sudo rm -f push_preseed/SUCCSS_push_preseed
     else
         folders=(
-            "pack-fish.openssh-fossa"
             "oem-fix-misc-cnl-skip-oobe"
             "oem-fix-misc-cnl-skip-storage-selecting"
         )
@@ -245,7 +241,7 @@ push_preseed() {
         done
     fi
 
-    for folder in misc_for_automation oem-fix-misc-cnl-oem-image-helper oem-fix-misc-cnl-skip-oobe; do
+    for folder in misc_for_automation 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