Merge ~alextu/pc-enablement/+git/oem-scripts:refine_recovery-from-iso into ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master

[Alex Tu]

[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
oem-meta-packages PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
mir-bug FAIL non-zero exit status 1
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.97-01868b2-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
oem-meta-packages PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
mir-bug FAIL non-zero exit status 1
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.97-01868b2-in-linux-container-focal

Unmerged commits

01868b2... by Alex Tu on 2021-06-22

paramter to keep iso, parameter to reuse local folder and refactor

diff --git a/recovery-from-iso.sh b/recovery-from-iso.sh
index c8a5b1c..6afe6a5 100755
--- a/recovery-from-iso.sh
+++ b/recovery-from-iso.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -ex
 
+keep="false"
+local_folder=""
 jenkins_job_for_iso=""
 jenkins_job_build_no="lastSuccessfulBuild"
 script_on_target_machine="inject_recovery_from_iso.sh"
@@ -12,17 +14,22 @@ temp_folder="$(mktemp -d -p "$PWD")"
 GIT="git -C $temp_folder"
 
 clear_all() {
+    if [ "$keep" = "true" ]; then
+        echo "[INFO] All downloaded files in $temp_folder"
+        return 0
+    fi
     rm -rf "$temp_folder"
 }
 trap clear_all EXIT
 # shellcheck disable=SC2046
-eval set -- $(getopt -o "hj:t:b:u:" -l "help,target-ip:,jenkins-job:,local-iso:,url:" -- "$@")
+eval set -- $(getopt -o "hj:t:b:u:" -l "help,target-ip:,jenkins-job:,local-folder:,local-iso:,url:,keep:" -- "$@")
 
 usage() {
 cat << EOF
 usage:
-$(basename "$0") -u <jenkins url> -j <jenkins-job-name> -b <jenkins-job-build-no> -t <target-ip> [-h|--help] [--dry-run]
-$(basename "$0") --local-iso <path to local iso file> -t <target-ip> [-h|--help] [--dry-run]
+$(basename "$0") -u <jenkins url> -j <jenkins-job-name> -b <jenkins-job-build-no> -t <target-ip> [-h|--help] [--keep <folder>]
+$(basename "$0") --local-iso <path to local iso file> -t <target-ip> [-h|--help]
+$(basename "$0") --local-folder <path to folder which have downloaded files> -t <target-ip> [-h|--help]
 
 Limition:
     It will failed when target recovery partition size smaller than target iso file.
@@ -38,6 +45,7 @@ OPTIONS:
     -b|--jenkins-job-build-no   The build number of the Jenkins job assigned by -j|--jenkins-job.
     -t|--target-ip  The IP address of target machine. It will be used for ssh accessing.
                     Please put your ssh key on target machine. This tool no yet support keyphase for ssh.
+    --keep                      Keep everything downloaded in specific folder.
     -h|--help Print this message
 
 Usage:
@@ -46,34 +54,69 @@ Usage:
 
     $(basename "$0") --local-iso ./dell-bto-focal-fossa-edge-alloem-X73-20210302-3.iso -t 192.168.101.68
 
+    $(basename "$0") --local-iso a-folder-included-iso-and-preseed -t 192.168.101.68
+
 EOF
 exit 1
 }
 
+# $1: target folder
+# $2: url of git repository
+# $3: branch, the default is master
+git_clone() {
+    local target_folder
+    local target_branch
+    local target_repo
+    target_branch="master"
+    target_folder="$1"
+    target_repo="$2"
+    if [ -n "$3" ]; then
+        target_branch="$3"
+    fi
+    for i in $(seq 5); do
+        if git -C $target_folder clone "$target_repo" --depth 1 -b $target_branch; then
+            return 0
+        else
+            echo "warnning: cloning $target_repo failed, retry no. $i"
+            sleep 3
+        fi
+    done
+    echo "ERROR: failed cloning $target_repo. Exit."
+    exit 1
+}
+
 download_preseed() {
     echo " == download_preseed == "
-    # 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-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
+    # get preseeds to skip enabling secureboot for somerville
+    git_clone "$temp_folder" https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-no-secureboot
+    # get preseeds to skip oobe
+    git_clone "$temp_folder" https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-skip-oobe
+    # get preseeds to skip storage selecting for somerville
+    git_clone "$temp_folder" https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-skip-storage-selecting
+    # get packages for openssh-server and openssh-client so that we can avoid dependency issue.
+    git_clone "$temp_folder" https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/pack-fish.openssh-fossa
 
     # 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
+    git_clone "$temp_folder" https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/oem-fix-misc-cnl-misc-for-automation
 
     return 0
 }
 push_preseed() {
     echo " == download_preseed == "
+    local target_folder
+    if [ -n "$local_folder" ]; then
+        target_folder="$local_folder"
+    else
+        target_folder="$temp_folder"
+    fi
     $SSH "$user_on_target"@"$target_ip" rm -rf push_preseed
     $SSH "$user_on_target"@"$target_ip" mkdir -p push_preseed
     $SSH "$user_on_target"@"$target_ip" touch push_preseed/SUCCSS_push_preseed
     $SSH "$user_on_target"@"$target_ip" sudo rm -f /cdrom/SUCCSS_push_preseed
 
-    for folder in pack-fish.openssh-fossa misc_for_automation oem-fix-misc-cnl-no-secureboot oem-fix-misc-cnl-skip-oobe oem-fix-misc-cnl-skip-storage-selecting; do
-        tar -C "$temp_folder"/$folder -zcvf "$temp_folder"/$folder.tar.gz .
-        $SCP "$temp_folder/$folder".tar.gz "$user_on_target"@"$target_ip":~
+    for folder in pack-fish.openssh-fossa oem-fix-misc-cnl-misc-for-automation oem-fix-misc-cnl-no-secureboot oem-fix-misc-cnl-skip-oobe oem-fix-misc-cnl-skip-storage-selecting; do
+        tar -C "$target_folder"/$folder -zcvf "$target_folder"/$folder.tar.gz .
+        $SCP "$target_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
     done
 
@@ -83,12 +126,26 @@ push_preseed() {
 inject_preseed() {
     echo " == inject_preseed == "
     $SSH "$user_on_target"@"$target_ip" rm -rf /tmp/SUCCSS_inject_preseed
-    download_preseed && \
+    if [ -z "$local_folder" ]; then
+        download_preseed
+    fi
     push_preseed
     scp -o StrictHostKeyChecking=no "$user_on_target"@"$target_ip":/cdrom/SUCCSS_push_preseed "$temp_folder" || usage
     $SSH "$user_on_target"@"$target_ip" touch /tmp/SUCCSS_inject_preseed
 }
 
+get_iso() {
+    jenkins_url="$1"
+    jenkins_job_for_iso="$2"
+    jenkins_job_build_no="$3"
+    img_jenkins_out_url="ftp://$jenkins_url/jenkins_host/jobs/$jenkins_job_for_iso/builds/$jenkins_job_build_no/archive/out"
+    img_name="$(wget -q "$img_jenkins_out_url/" -O - | grep -o 'href=.*iso"' | awk -F/ '{print $NF}' | tr -d \")"
+    wget "$img_jenkins_out_url/$img_name".md5sum
+    md5sum -c "$img_name".md5sum || wget "$img_jenkins_out_url"/"$img_name"
+    md5sum -c "$img_name".md5sum || usage
+    local_iso="$PWD/$img_name"
+}
+
 inject_recovery_iso() {
     if [ -n "$local_iso" ]; then
         img_name="$(basename "$local_iso")"
@@ -109,14 +166,12 @@ EOF
         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"
         scp -o StrictHostKeyChecking=no "$user_on_target"@"$target_ip":/tmp/SUCCSS_inject_recovery_iso "$temp_folder" || usage
+    elif [ -n "$local_folder" ]; then
+        local_iso="$(find $local_folder | grep "\.iso$")"
+        inject_recovery_iso
     else
-        img_jenkins_out_url="ftp://$jenkins_url/jenkins_host/jobs/$jenkins_job_for_iso/builds/$jenkins_job_build_no/archive/out"
-        img_name="$(wget -q "$img_jenkins_out_url/" -O - | grep -o 'href=.*iso"' | awk -F/ '{print $NF}' | tr -d \")"
         pushd "$temp_folder" || usage
-        wget "$img_jenkins_out_url/$img_name".md5sum
-        md5sum -c "$img_name".md5sum || wget "$img_jenkins_out_url"/"$img_name"
-        md5sum -c "$img_name".md5sum || usage
-        local_iso="$PWD/$img_name"
+            get_iso "$jenkins_url" "$jenkins_job_for_iso" "$jenkins_job_build_no"
         popd
         inject_recovery_iso
     fi
@@ -150,6 +205,17 @@ main() {
                 shift
                 local_iso="$1"
                 ;;
+            --local-folder)
+                shift
+                local_folder="$1"
+                ;;
+            --keep)
+                shift
+                keep="true"
+                rm -rf "$temp_folder"
+                temp_folder="$1"
+                mkdir -p "$temp_folder"
+                ;;
             -u | --url)
                 shift
                 jenkins_url="$1"