ci-automation: skip torcx depending on OS version

ci-automation/test.sh

@@ -177,7 +177,13 @@ function _test_run_impl() {
     mantle_ref=$(cat sdk_container/.repo/manifests/mantle-container)
 
     # Make the torcx artifacts available to test implementation
-    __prepare_torcx "${arch}" "${vernum}" "${work_dir}"
+    # NOTE major releases after 3745 do not ship torcx but use sysext.
+    local major="${FLATCAR_VERSION%%.*}"
+    if [[ $major -le 3745 ]] ; then
+        __prepare_torcx "${arch}" "${vernum}" "${work_dir}"
+    else
+        echo "true" > "${work_dir}/skip_torcx"
+    fi
 
     local tap_merged_summary="results-${image}"
     local tap_merged_detailed="results-${image}-detailed"
@@ -214,7 +220,7 @@ function _test_run_impl() {
         #  determine success based on test results (tapfile).
         set +e
         touch sdk_container/.env
-        docker run --pull always --rm --name="${container_name}" --privileged --net host -v /dev:/dev \
+        docker run --rm --name="${container_name}" --privileged --net host -v /dev:/dev \
           -w /work -v "$PWD":/work "${mantle_ref}" \
          bash -c "git config --global --add safe.directory /work && \
                   source sdk_container/.env && \
@@ -223,7 +229,7 @@ function _test_run_impl() {
         rm -f "${work_dir}/first_run"
 
         # Note: git safe.directory is not set in this run as it does not use git
-        docker run --pull always --rm --name="${container_name}" --privileged --net host -v /dev:/dev \
+        docker run --rm --name="${container_name}" --privileged --net host -v /dev:/dev \
           -w /work -v "$PWD":/work "${mantle_ref}" \
             ci-automation/test_update_reruns.sh \
                 "${arch}" "${vernum}" "${image}" "${retry}" \

ci-automation/vendor-testing/aws.sh

@@ -58,7 +58,7 @@ run_kola_tests() {
          --aws-type="${instance_type}" \
          --aws-iam-profile="${AWS_IAM_PROFILE}" \
          --tapfile="${instance_tapfile}" \
-         --torcx-manifest="${CIA_TORCX_MANIFEST}" \
+         ${CIA_KOLA_TORCX_MANIFEST_OPT} \
          "${@}"
 }
 

ci-automation/vendor-testing/azure.sh

@@ -53,7 +53,7 @@ run_kola_tests() {
       --azure-image-file="${AZURE_IMAGE_NAME}" \
       --azure-location="${AZURE_LOCATION}" \
       --azure-identity \
-      --torcx-manifest="${CIA_TORCX_MANIFEST}" \
+      ${CIA_KOLA_TORCX_MANIFEST_OPT} \
       --tapfile="${instance_tapfile}" \
       --azure-size="${instance_type}" \
       --azure-hyper-v-generation="${hyperv_gen}" \

ci-automation/vendor-testing/digitalocean.sh

@@ -51,7 +51,7 @@ timeout --signal=SIGQUIT 4h\
     --platform=do \
     --channel="${CIA_CHANNEL}" \
     --tapfile="${CIA_TAPFILE}" \
-    --torcx-manifest="${CIA_TORCX_MANIFEST}" \
+    ${CIA_KOLA_TORCX_MANIFEST_OPT} \
     "${@}"
 
 set +x

ci-automation/vendor-testing/equinix_metal.sh

@@ -36,7 +36,7 @@ run_kola_tests() {
           --platform=equinixmetal \
           --tapfile="${instance_tapfile}" \
           --parallel="${EQUINIXMETAL_PARALLEL}" \
-          --torcx-manifest="${CIA_TORCX_MANIFEST}" \
+          ${CIA_KOLA_TORCX_MANIFEST_OPT} \
           --equinixmetal-image-url="${BASE_URL}/${EQUINIXMETAL_IMAGE_NAME}" \
           --equinixmetal-installer-image-kernel-url="${BASE_URL}/${PXE_KERNEL_NAME}" \
           --equinixmetal-installer-image-cpio-url="${BASE_URL}/${PXE_IMAGE_NAME}" \

ci-automation/vendor-testing/gce.sh

@@ -62,7 +62,7 @@ run_kola_tests() {
         --platform=gce \
         --channel="${CIA_CHANNEL}" \
         --tapfile="${instance_tapfile}" \
-        --torcx-manifest="${CIA_TORCX_MANIFEST}" \
+        ${CIA_KOLA_TORCX_MANIFEST_OPT} \
         "${@}"
 }
 

ci-automation/vendor-testing/openstack.sh

@@ -49,8 +49,8 @@ timeout --signal=SIGQUIT 2h kola run \
   --parallel="${OPENSTACK_PARALLEL}" \
   --tapfile="${CIA_TAPFILE}" \
   --channel="${CIA_CHANNEL}" \
-  --torcx-manifest="${CIA_TORCX_MANIFEST}" \
   --basename="${kola_test_basename}" \
+  ${CIA_KOLA_TORCX_MANIFEST_OPT} \
   --platform=openstack \
   --openstack-network=public \
   --openstack-domain=default \

ci-automation/vendor-testing/qemu.sh

@@ -64,7 +64,7 @@ kola run \
     --qemu-bios="${bios}" \
     --qemu-image="${QEMU_IMAGE_NAME}" \
     --tapfile="${CIA_TAPFILE}" \
-    --torcx-manifest="${CIA_TORCX_MANIFEST}" \
+    ${CIA_KOLA_TORCX_MANIFEST_OPT} \
     ${QEMU_KOLA_SKIP_MANGLE:+--qemu-skip-mangle} \
     "${devcontainer_opts[@]}" \
     "${@}"

ci-automation/vendor-testing/qemu_update.sh

@@ -115,7 +115,7 @@ run_kola_tests() {
       --qemu-bios="${bios}" \
       --qemu-image="${image}" \
       --tapfile="${instance_tapfile}" \
-      --torcx-manifest="${CIA_TORCX_MANIFEST}" \
+      ${CIA_KOLA_TORCX_MANIFEST_OPT} \
       --update-payload="${QEMU_UPDATE_PAYLOAD}" \
       ${QEMU_KOLA_SKIP_MANGLE:+--qemu-skip-mangle} \
       "${tests[@]}"

ci-automation/vendor-testing/vmware.sh

@@ -60,7 +60,7 @@ sudo timeout --signal=SIGQUIT 2h kola run \
     --platform=esx \
     --tapfile="${CIA_TAPFILE}" \
     --parallel="${VMWARE_ESX_PARALLEL}" \
-    --torcx-manifest="${CIA_TORCX_MANIFEST}" \
+    ${CIA_KOLA_TORCX_MANIFEST_OPT} \
     --esx-config-file "${config_file}" \
     --esx-ova-path "${VMWARE_ESX_IMAGE_NAME}" \
     "${@}"

ci-automation/vendor_test.sh

@@ -51,6 +51,13 @@
 #   Path to the Torcx manifest. Usually passed to kola through the
 #   --torcx-manifest parameter.
 #
+# CIA_KOLA_TORCX_MANIFEST_OPT:
+#   Torcx manifest version check convenience option for kola.
+#   Major releases after 3745 do not ship torcx (these use sysext) so
+#   there's no torcx manifest.
+#   Will contain "--torcx-manifest=$CIA_TORCX_MANIFEST"
+#   for MAJOR <= 3745 and is empty for greater versions.
+#
 # CIA_FIRST_RUN:
 #   1 if this is a first run, 0 if it is a rerun of failed tests.
 #
@@ -92,6 +99,7 @@ fi
 # directories.
 ciavts_tapfile="${PWD}/${ciavts_work_dir}/${ciavts_tapfile}"
 ciavts_torcx_manifest="${PWD}/${ciavts_main_work_dir}/torcx_manifest.json"
+ciavts_skip_torcx=$(cat "${ciavts_main_work_dir}/skip_torcx")
 
 ciavts_first_run=0
 if [[ -f "${ciavts_main_work_dir}/first_run" ]]; then
@@ -109,9 +117,16 @@ CIA_CHANNEL="${ciavts_channel}"
 CIA_TESTSCRIPT="${ciavts_testscript}"
 CIA_GIT_VERSION="${ciavts_git_version}"
 CIA_BUILD_TYPE="${ciavts_type}"
-CIA_TORCX_MANIFEST="${ciavts_torcx_manifest}"
 CIA_FIRST_RUN="${ciavts_first_run}"
 
+if [[ "${ciavts_skip_torcx}" = "true" ]] ; then
+    CIA_TORCX_MANIFEST=""
+    CIA_KOLA_TORCX_MANIFEST_OPT=""
+else
+    CIA_TORCX_MANIFEST="${ciavts_torcx_manifest}"
+    CIA_KOLA_TORCX_MANIFEST_OPT="--torcx-manifest=${CIA_TORCX_MANIFEST}"
+fi
+
 # Unset all variables with ciavts_ prefix now.
 unset -v "${!ciavts_@}"