ci-automation: Opt-in other vendor tests to default kola test runner

ci-automation/vendor-testing/digitalocean.sh

@@ -48,20 +48,23 @@ trap 'ore do delete-image \
     --name="${image_name}" \
     --config-file="${config_file}"' EXIT
 
-set -x
+run_kola_tests() {
+    local instance_type="${1}"; shift
+    local instance_tapfile="${1}"; shift
 
-timeout --signal=SIGQUIT 4h\
+    timeout --signal=SIGQUIT 4h\
     kola run \
-    --do-size="${DIGITALOCEAN_MACHINE_SIZE}" \
-    --do-region="${DIGITALOCEAN_REGION}" \
-    --basename="${image_name}" \
-    --do-config-file="${config_file}" \
-    --do-image="${image_name}" \
-    --parallel="${DIGITALOCEAN_PARALLEL}" \
-    --platform=do \
-    --channel="${CIA_CHANNEL}" \
-    --tapfile="${CIA_TAPFILE}" \
-    --torcx-manifest="${CIA_TORCX_MANIFEST}" \
-    "${@}"
+        --do-size="${instance_type}" \
+        --do-region="${DIGITALOCEAN_REGION}" \
+        --basename="${image_name}" \
+        --do-config-file="${config_file}" \
+        --do-image="${image_name}" \
+        --parallel="${DIGITALOCEAN_PARALLEL}" \
+        --platform=do \
+        --channel="${CIA_CHANNEL}" \
+        --tapfile="${instance_tapfile}" \
+        --torcx-manifest="${CIA_TORCX_MANIFEST}" \
+        "${@}"
+}
 
-set +x
+run_default_kola_tests

ci-automation/vendor-testing/openstack.sh

@@ -52,24 +52,27 @@ trap 'ore --config-file "${config_file}" openstack delete-image --id "${IMAGE_ID
 kola_test_basename="ci-${CIA_VERNUM//+/-}"
 kola_test_basename="${kola_test_basename//[+.]/-}"
 
-set -x
+run_kola_tests() {
+    shift # ignore the instance type
+    local instance_tapfile="${1}"; shift
 
-timeout --signal=SIGQUIT 2h kola run \
-  --board="${CIA_ARCH}-usr" \
-  --parallel="${OPENSTACK_PARALLEL}" \
-  --tapfile="${CIA_TAPFILE}" \
-  --channel="${CIA_CHANNEL}" \
-  --torcx-manifest="${CIA_TORCX_MANIFEST}" \
-  --basename="${kola_test_basename}" \
-  --platform=openstack \
-  --openstack-network=public \
-  --openstack-domain=default \
-  --openstack-flavor=flatcar-flavor \
-  --openstack-user="${OPENSTACK_USER}" \
-  --openstack-host="${OPENSTACK_HOST}" \
-  --openstack-keyfile="${openstack_keyfile}" \
-  --openstack-image="${IMAGE_ID}" \
-  --openstack-config-file="${config_file}" \
-  "${@}"
+    timeout --signal=SIGQUIT 2h kola run \
+            --board="${CIA_ARCH}-usr" \
+            --parallel="${OPENSTACK_PARALLEL}" \
+            --tapfile="${instance_tapfile}" \
+            --channel="${CIA_CHANNEL}" \
+            --torcx-manifest="${CIA_TORCX_MANIFEST}" \
+            --basename="${kola_test_basename}" \
+            --platform=openstack \
+            --openstack-network=public \
+            --openstack-domain=default \
+            --openstack-flavor=flatcar-flavor \
+            --openstack-user="${OPENSTACK_USER}" \
+            --openstack-host="${OPENSTACK_HOST}" \
+            --openstack-keyfile="${openstack_keyfile}" \
+            --openstack-image="${IMAGE_ID}" \
+            --openstack-config-file="${config_file}" \
+            "${@}"
+}
 
-set +x
+run_default_kola_tests

ci-automation/vendor-testing/qemu.sh

@@ -52,17 +52,20 @@ if [ "${CIA_TESTSCRIPT}" = "qemu_uefi.sh" ] ; then
     fi
 fi
 
-set -x
+run_kola_tests() {
+    shift # ignore the instance type
+    local instance_tapfile="${1}"; shift
 
-kola run \
-    --board="${CIA_ARCH}-usr" \
-    --parallel="${QEMU_PARALLEL}" \
-    --platform=qemu \
-    --qemu-bios="${bios}" \
-    --qemu-image="${QEMU_IMAGE_NAME}" \
-    --tapfile="${CIA_TAPFILE}" \
-    --torcx-manifest="${CIA_TORCX_MANIFEST}" \
-    --qemu-skip-mangle \
-    "${@}"
+    kola run \
+         --board="${CIA_ARCH}-usr" \
+         --parallel="${QEMU_PARALLEL}" \
+         --platform=qemu \
+         --qemu-bios="${bios}" \
+         --qemu-image="${QEMU_IMAGE_NAME}" \
+         --tapfile="${instance_tapfile}" \
+         --torcx-manifest="${CIA_TORCX_MANIFEST}" \
+         --qemu-skip-mangle \
+         "${@}"
+}
 
-set +x
+run_default_kola_tests

ci-automation/vendor-testing/qemu_update.sh

@@ -115,4 +115,4 @@ run_kola_tests() {
       cl.update.payload
 }
 
-run_kola_tests_on_instances "previous" "${CIA_TAPFILE}" "${CIA_FIRST_RUN}" first_dual -- cl.update.payload -- "${@}"
+run_default_kola_tests

ci-automation/vendor-testing/vmware.sh

@@ -61,18 +61,21 @@ kola_test_basename="ci-${CIA_VERNUM//+/-}"
 trap 'ore esx --esx-config-file "${config_file}" remove-vms \
     --pattern "${kola_test_basename}*" || :' EXIT
 
-set -x
+run_kola_tests() {
+    shift # ignore the instance type
+    local instance_tapfile="${1}"; shift
 
-sudo timeout --signal=SIGQUIT 2h kola run \
-    --board="${CIA_ARCH}-usr" \
-    --basename="${kola_test_basename}" \
-    --channel="${CIA_CHANNEL}" \
-    --platform=esx \
-    --tapfile="${CIA_TAPFILE}" \
-    --parallel="${VMWARE_ESX_PARALLEL}" \
-    --torcx-manifest="${CIA_TORCX_MANIFEST}" \
-    --esx-config-file "${config_file}" \
-    --esx-ova-path "${VMWARE_ESX_IMAGE_NAME}" \
-    "${@}"
+    timeout --signal=SIGQUIT 2h kola run \
+            --board="${CIA_ARCH}-usr" \
+            --basename="${kola_test_basename}" \
+            --channel="${CIA_CHANNEL}" \
+            --platform=esx \
+            --tapfile="${instance_tapfile}" \
+            --parallel="${VMWARE_ESX_PARALLEL}" \
+            --torcx-manifest="${CIA_TORCX_MANIFEST}" \
+            --esx-config-file "${config_file}" \
+            --esx-ova-path "${VMWARE_ESX_IMAGE_NAME}" \
+            "${@}"
+}
 
-set +x
+run_default_kola_tests