From 158a5c934a363e8a0ddb1732b4250a02cf439584 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 18 Aug 2022 15:56:48 +0200
Subject: [PATCH 1/3] run_sdk_container: Do not mention nonexistent flag

Looks like it was either never implemented, or was implemented and
dropped before the script was added to the repo.
---
 run_sdk_container | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/run_sdk_container b/run_sdk_container
index d82331b66c..808e4ab5bd 100755
--- a/run_sdk_container
+++ b/run_sdk_container
@@ -21,7 +21,7 @@ cleanup=""
 
 usage() {
     echo "  Usage:"
-    echo "  $0 [-t] [-v <version>] [-V sdk version] [-a arch] [-n <name> ] [-x <script>] [-C custom-container] [-F] [--rm] [container-command]"
+    echo "  $0 [-t] [-v <version>] [-V sdk version] [-a arch] [-n <name> ] [-x <script>] [-C custom-container] [--rm] [container-command]"
     echo "       Start an SDK container of a given SDK release version."
     echo "       This will create the container if it does not exist, otherwise start the existing container."
     echo "       If the container is already running then it will exec into the container."
@@ -32,7 +32,7 @@ usage() {
     echo "      -v <version> - Sourcetree (OS image) version to use."
     echo "                     Defaults to '$os_version' (current git commit)."
     echo "                     FLATCAR_VERSION[_ID] in '$sdk_container_common_versionfile'"
-    echo "                     will be updated accordingly (also see -F)."
+    echo "                     will be updated accordingly."
     echo "      -V <SDK ver> - SDK version to use. Defaults to '${sdk_version}'"
     echo "                     (FLATCAR_SDK_VERSION from '$sdk_container_common_versionfile')."
     echo "      -a <amd64|arm64|all> - Target architecture (board support) of the SDK."

From 2d226f864ed3a12b9614ec030d2f35006d16c716 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 18 Aug 2022 16:15:26 +0200
Subject: [PATCH 2/3] ci-automation/packages.sh: Fix access to unbound variable

We were running the run_sdk_container script with passing a value of a
variable named version to the script through the -v flag. But nowhere
is the variable defined. This worked under jenkins, because jenkins
job has a version parameter that gets exported into environment under
the same name. But running it manually outside jenkins revealed the
bug.

The script should have been using a vernum variable. Now, the
difference between this variable and the version variable is that
"version" was in form of <channel>-<version>-<build_id>, whereas
"vernum" comes without the channel part. Fortunately,
"run_sdk_container" was stripping the channel part before using this
value, so it makes no difference whether we pass
main-3333.0.0.0-some-id or just 3333.0.0-some-id.
---
 ci-automation/packages.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci-automation/packages.sh b/ci-automation/packages.sh
index 5389b04aaf..029b1f4c56 100644
--- a/ci-automation/packages.sh
+++ b/ci-automation/packages.sh
@@ -82,10 +82,10 @@ function _packages_build_impl() {
     local packages_container="flatcar-packages-${arch}-${docker_vernum}"
 
     # Build packages; store packages and torcx output in container
-    ./run_sdk_container -x ./ci-cleanup.sh -n "${packages_container}" -v "${version}" \
+    ./run_sdk_container -x ./ci-cleanup.sh -n "${packages_container}" -v "${vernum}" \
         -C "${sdk_image}" \
         mkdir -p "${CONTAINER_TORCX_ROOT}"
-    ./run_sdk_container -n "${packages_container}" -v "${version}" \
+    ./run_sdk_container -n "${packages_container}" -v "${vernum}" \
         -C "${sdk_image}" \
         ./build_packages --board="${arch}-usr" \
             --torcx_output_root="${CONTAINER_TORCX_ROOT}"
@@ -94,7 +94,7 @@ function _packages_build_impl() {
     local torcx_tmp="__build__/torcx_tmp"
     rm -rf "${torcx_tmp}"
     mkdir "${torcx_tmp}"
-    ./run_sdk_container -n "${packages_container}" -v "${version}" \
+    ./run_sdk_container -n "${packages_container}" -v "${vernum}" \
         -C "${sdk_image}" \
         cp -r "${CONTAINER_TORCX_ROOT}/" \
         "${torcx_tmp}"

From 73bb00a9d0b86f0a809cb35778167ff5fdee385c Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Wed, 24 Aug 2022 13:47:23 +0200
Subject: [PATCH 3/3] ci-automation: Break retest cycle properly in qemu on
 arm64

Rerunning the test will always yield the same result in this case, so
it's pointless.
---
 ci-automation/vendor-testing/qemu.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci-automation/vendor-testing/qemu.sh b/ci-automation/vendor-testing/qemu.sh
index 93c7a06550..99e9d2a9c2 100755
--- a/ci-automation/vendor-testing/qemu.sh
+++ b/ci-automation/vendor-testing/qemu.sh
@@ -17,6 +17,7 @@ if [ "${CIA_ARCH}" = "arm64" ] && [ "${CIA_TESTSCRIPT}" != "qemu_uefi.sh" ] ; th
     echo "  ---" >> "${CIA_TAPFILE}"
     echo "  ERROR: ARM64 tests only supported on qemu_uefi." | tee -a "${CIA_TAPFILE}"
     echo "  ..." >> "${CIA_TAPFILE}"
+    break_retest_cycle
     exit 1
 fi