diff --git a/ci-automation/vendor-testing/aws.sh b/ci-automation/vendor-testing/aws.sh index f33f668b8e5..d2f1ccec871 100755 --- a/ci-automation/vendor-testing/aws.sh +++ b/ci-automation/vendor-testing/aws.sh @@ -58,6 +58,7 @@ run_kola_tests() { --aws-type="${instance_type}" \ --aws-iam-profile="${AWS_IAM_PROFILE}" \ --tapfile="${instance_tapfile}" \ + --image-version "${CIA_VERNUM}" \ "${@}" } diff --git a/ci-automation/vendor-testing/azure.sh b/ci-automation/vendor-testing/azure.sh index c84e36ed9c7..1aa3f5ac0e4 100755 --- a/ci-automation/vendor-testing/azure.sh +++ b/ci-automation/vendor-testing/azure.sh @@ -59,6 +59,7 @@ run_kola_tests() { ${AZURE_KOLA_VNET:+--azure-kola-vnet=${AZURE_KOLA_VNET}} \ ${azure_vnet_subnet_name:+--azure-vnet-subnet-name=${azure_vnet_subnet_name}} \ ${AZURE_USE_PRIVATE_IPS:+--azure-use-private-ips=${AZURE_USE_PRIVATE_IPS}} \ + --image-version "${CIA_VERNUM}" \ "${@}" } diff --git a/ci-automation/vendor-testing/brightbox.sh b/ci-automation/vendor-testing/brightbox.sh index 9ec8160e2ae..e18a9153c83 100755 --- a/ci-automation/vendor-testing/brightbox.sh +++ b/ci-automation/vendor-testing/brightbox.sh @@ -61,6 +61,7 @@ timeout --signal=SIGQUIT 2h kola run \ --brightbox-client-id="${BRIGHTBOX_CLIENT_ID}" \ --brightbox-client-secret="${BRIGHTBOX_CLIENT_SECRET}" \ --brightbox-server-type="${BRIGHTBOX_SERVER_TYPE}" \ + --image-version "${CIA_VERNUM}" \ "${@}" set +x diff --git a/ci-automation/vendor-testing/digitalocean.sh b/ci-automation/vendor-testing/digitalocean.sh index 14e100ed291..6ee300282ed 100755 --- a/ci-automation/vendor-testing/digitalocean.sh +++ b/ci-automation/vendor-testing/digitalocean.sh @@ -51,6 +51,7 @@ timeout --signal=SIGQUIT 4h\ --platform=do \ --channel="${CIA_CHANNEL}" \ --tapfile="${CIA_TAPFILE}" \ + --image-version "${CIA_VERNUM}" \ "${@}" set +x diff --git a/ci-automation/vendor-testing/equinix_metal.sh b/ci-automation/vendor-testing/equinix_metal.sh index 8bab8541105..376742e1336 100755 --- a/ci-automation/vendor-testing/equinix_metal.sh +++ b/ci-automation/vendor-testing/equinix_metal.sh @@ -45,6 +45,7 @@ run_kola_tests() { --equinixmetal-storage-url="${EQUINIXMETAL_STORAGE_URL}" \ --gce-json-key=<(set +x; echo "${GCP_JSON_KEY}" | base64 --decode) \ --equinixmetal-api-key="${EQUINIXMETAL_KEY}" \ + --image-version "${CIA_VERNUM}" \ "${@}" } diff --git a/ci-automation/vendor-testing/gce.sh b/ci-automation/vendor-testing/gce.sh index ec26fbe57fb..e37e19bb0eb 100755 --- a/ci-automation/vendor-testing/gce.sh +++ b/ci-automation/vendor-testing/gce.sh @@ -62,6 +62,7 @@ run_kola_tests() { --platform=gce \ --channel="${CIA_CHANNEL}" \ --tapfile="${instance_tapfile}" \ + --image-version "${CIA_VERNUM}" \ "${@}" } diff --git a/ci-automation/vendor-testing/hetzner.sh b/ci-automation/vendor-testing/hetzner.sh index 11991694596..0cb7e2ecf51 100755 --- a/ci-automation/vendor-testing/hetzner.sh +++ b/ci-automation/vendor-testing/hetzner.sh @@ -53,6 +53,7 @@ timeout --signal=SIGQUIT 2h kola run \ --hetzner-server-type="${hetzner_instance_type}" \ --hetzner-location="${HETZNER_LOCATION}" \ --hetzner-image=${IMAGE_ID} \ + --image-version "${CIA_VERNUM}" \ "${@}" set +x diff --git a/ci-automation/vendor-testing/openstack.sh b/ci-automation/vendor-testing/openstack.sh index 4efa6d49071..d0cc4cd18c9 100755 --- a/ci-automation/vendor-testing/openstack.sh +++ b/ci-automation/vendor-testing/openstack.sh @@ -59,6 +59,7 @@ timeout --signal=SIGQUIT 2h kola run \ --openstack-keyfile="${openstack_keyfile}" \ --openstack-image="${IMAGE_ID}" \ --openstack-config-file="${config_file}" \ + --image-version "${CIA_VERNUM}" \ "${@}" set +x diff --git a/ci-automation/vendor-testing/qemu.sh b/ci-automation/vendor-testing/qemu.sh index c0cd25f8d82..4e103303fc7 100755 --- a/ci-automation/vendor-testing/qemu.sh +++ b/ci-automation/vendor-testing/qemu.sh @@ -87,6 +87,7 @@ kola run \ ${QEMU_KOLA_SKIP_MANGLE:+--qemu-skip-mangle} \ "${devcontainer_opts[@]}" \ ${SECUREBOOT:+--enable-secureboot} \ + --image-version "${CIA_VERNUM}" \ "${@}" set +x diff --git a/ci-automation/vendor-testing/qemu_update.sh b/ci-automation/vendor-testing/qemu_update.sh index 68d7d565c94..32e100b708e 100755 --- a/ci-automation/vendor-testing/qemu_update.sh +++ b/ci-automation/vendor-testing/qemu_update.sh @@ -127,6 +127,7 @@ run_kola_tests() { --update-payload="${QEMU_UPDATE_PAYLOAD}" \ "${ovmf_vars:+--qemu-ovmf-vars=${ovmf_vars}}" \ ${QEMU_KOLA_SKIP_MANGLE:+--qemu-skip-mangle} \ + --image-version "${CIA_VERNUM}" \ "${tests[@]}" } diff --git a/ci-automation/vendor-testing/vmware.sh b/ci-automation/vendor-testing/vmware.sh index ce0ca1eeff5..9bd7505dfe8 100755 --- a/ci-automation/vendor-testing/vmware.sh +++ b/ci-automation/vendor-testing/vmware.sh @@ -62,6 +62,7 @@ sudo timeout --signal=SIGQUIT 2h kola run \ --parallel="${VMWARE_ESX_PARALLEL}" \ --esx-config-file "${config_file}" \ --esx-ova-path "${VMWARE_ESX_IMAGE_NAME}" \ + --image-version "${CIA_VERNUM}" \ "${@}" set +x diff --git a/sdk_container/.repo/manifests/mantle-container b/sdk_container/.repo/manifests/mantle-container index 35b6b23b587..300729d3b3c 100644 --- a/sdk_container/.repo/manifests/mantle-container +++ b/sdk_container/.repo/manifests/mantle-container @@ -1 +1 @@ -ghcr.io/flatcar/mantle:git-44f7581074376fcd25ef8e5b7e5134408ba05d62 +ghcr.io/flatcar/mantle:pr-572