From a35610cf35c460f5d4e85e5555a40cdff1cad774 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 4 Feb 2025 16:21:22 +0100 Subject: [PATCH 1/2] ci-automation: Pass image version to kola --- ci-automation/vendor-testing/aws.sh | 1 + ci-automation/vendor-testing/azure.sh | 1 + ci-automation/vendor-testing/brightbox.sh | 1 + ci-automation/vendor-testing/digitalocean.sh | 1 + ci-automation/vendor-testing/equinix_metal.sh | 1 + ci-automation/vendor-testing/gce.sh | 1 + ci-automation/vendor-testing/openstack.sh | 1 + ci-automation/vendor-testing/qemu.sh | 1 + ci-automation/vendor-testing/qemu_update.sh | 1 + ci-automation/vendor-testing/vmware.sh | 1 + 10 files changed, 10 insertions(+) diff --git a/ci-automation/vendor-testing/aws.sh b/ci-automation/vendor-testing/aws.sh index f9e3c34f068..f3a36217900 100755 --- a/ci-automation/vendor-testing/aws.sh +++ b/ci-automation/vendor-testing/aws.sh @@ -59,6 +59,7 @@ run_kola_tests() { --aws-iam-profile="${AWS_IAM_PROFILE}" \ --tapfile="${instance_tapfile}" \ --torcx-manifest="${CIA_TORCX_MANIFEST}" \ + --image-version "${CIA_VERNUM}" \ "${@}" } diff --git a/ci-automation/vendor-testing/azure.sh b/ci-automation/vendor-testing/azure.sh index f28c1d1c0ee..3ee7fded751 100755 --- a/ci-automation/vendor-testing/azure.sh +++ b/ci-automation/vendor-testing/azure.sh @@ -59,6 +59,7 @@ run_kola_tests() { ${AZURE_USE_GALLERY} \ ${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 3ca82ac2e46..8993ae87d45 100755 --- a/ci-automation/vendor-testing/digitalocean.sh +++ b/ci-automation/vendor-testing/digitalocean.sh @@ -52,6 +52,7 @@ timeout --signal=SIGQUIT 4h\ --channel="${CIA_CHANNEL}" \ --tapfile="${CIA_TAPFILE}" \ --torcx-manifest="${CIA_TORCX_MANIFEST}" \ + --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 5f4440fd122..caf724e96e1 100755 --- a/ci-automation/vendor-testing/equinix_metal.sh +++ b/ci-automation/vendor-testing/equinix_metal.sh @@ -46,6 +46,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 2ab0fd1284d..06c53472f75 100755 --- a/ci-automation/vendor-testing/gce.sh +++ b/ci-automation/vendor-testing/gce.sh @@ -63,6 +63,7 @@ run_kola_tests() { --channel="${CIA_CHANNEL}" \ --tapfile="${instance_tapfile}" \ --torcx-manifest="${CIA_TORCX_MANIFEST}" \ + --image-version "${CIA_VERNUM}" \ "${@}" } diff --git a/ci-automation/vendor-testing/openstack.sh b/ci-automation/vendor-testing/openstack.sh index caaa7fe3b1d..a46e6411963 100755 --- a/ci-automation/vendor-testing/openstack.sh +++ b/ci-automation/vendor-testing/openstack.sh @@ -60,6 +60,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 ff66b6ed459..b62dbd8dcfc 100755 --- a/ci-automation/vendor-testing/qemu.sh +++ b/ci-automation/vendor-testing/qemu.sh @@ -64,6 +64,7 @@ kola run \ --torcx-manifest="${CIA_TORCX_MANIFEST}" \ ${QEMU_KOLA_SKIP_MANGLE:+--qemu-skip-mangle} \ "${devcontainer_opts[@]}" \ + --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 9c33d24839c..412d1e5b074 100755 --- a/ci-automation/vendor-testing/qemu_update.sh +++ b/ci-automation/vendor-testing/qemu_update.sh @@ -107,6 +107,7 @@ run_kola_tests() { --torcx-manifest="${CIA_TORCX_MANIFEST}" \ --update-payload="${QEMU_UPDATE_PAYLOAD}" \ ${QEMU_KOLA_SKIP_MANGLE:+--qemu-skip-mangle} \ + --image-version "${CIA_VERNUM}" \ cl.update.payload } diff --git a/ci-automation/vendor-testing/vmware.sh b/ci-automation/vendor-testing/vmware.sh index 399fbfc897f..38c295d4b5a 100755 --- a/ci-automation/vendor-testing/vmware.sh +++ b/ci-automation/vendor-testing/vmware.sh @@ -63,6 +63,7 @@ sudo timeout --signal=SIGQUIT 2h kola run \ --torcx-manifest="${CIA_TORCX_MANIFEST}" \ --esx-config-file "${config_file}" \ --esx-ova-path "${VMWARE_ESX_IMAGE_NAME}" \ + --image-version "${CIA_VERNUM}" \ "${@}" set +x From c89333dd20ef160249d4f00bbc2d42258c81285d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 8 Jan 2025 16:49:12 +0100 Subject: [PATCH 2/2] test mantle --- sdk_container/.repo/manifests/mantle-container | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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