From 9ac9cc9e8327251d3e71f36fd6387979911bd93c Mon Sep 17 00:00:00 2001
From: Yalan Zhang <yalzhang@redhat.com>
Date: Mon, 2 Feb 2026 10:07:11 +0800
Subject: [PATCH] Fix integration test timeout with VM image pull optimization

- Increase test_attestation VM startup timeout from 300s to 900s
- Update pre-pull-images.sh to use $APPROVED_IMAGE from Makefile
- Delete the kubevirt images in the pre-pull-images.sh since the
  multi-arch load issues

Signed-off-by: Yalan Zhang <yalzhang@redhat.com>
---
 scripts/pre-pull-images.sh | 18 ++++--------------
 tests/attestation.rs       |  2 +-
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/scripts/pre-pull-images.sh b/scripts/pre-pull-images.sh
index 2f24850..96697bf 100755
--- a/scripts/pre-pull-images.sh
+++ b/scripts/pre-pull-images.sh
@@ -4,25 +4,15 @@
 #
 # SPDX-License-Identifier: CC0-1.0
 
-KV_VERSION=v1.7.0
+# Pre-pull images that are used by integration tests to speed up test execution.
+
 IMAGES=(
-	"quay.io/kubevirt/virt-launcher:${KV_VERSION}"
-	"quay.io/kubevirt/virt-handler:${KV_VERSION}"
-	"quay.io/kubevirt/virt-api:${KV_VERSION}"
-	"quay.io/kubevirt/virt-controller:${KV_VERSION}"
-	"quay.io/kubevirt/virt-operator:${KV_VERSION}"
 	"$TRUSTEE_IMAGE"
-	"quay.io/trusted-execution-clusters/fedora-coreos-kubevirt:2026-14-01"
+	"$APPROVED_IMAGE"
 )
 
 for IMAGE in "${IMAGES[@]}"; do
     echo "Pulling: $IMAGE"
-    docker pull "$IMAGE"
-    if [ $? -eq 0 ]; then
-        echo "Successfully pulled $IMAGE"
-    else
-        echo "Error: Failed to pull $IMAGE"
-    fi
-	 kind load docker-image $IMAGE
+    docker pull "$IMAGE" && kind load docker-image "$IMAGE" || echo "Error: Failed to pull $IMAGE"
     echo "-------------------------------"
 done
diff --git a/tests/attestation.rs b/tests/attestation.rs
index 2947ef2..221c2a9 100644
--- a/tests/attestation.rs
+++ b/tests/attestation.rs
@@ -68,7 +68,7 @@ impl SingleAttestationContext {
         .await?;
 
         test_ctx.info(format!("Waiting for VM {} to reach Running state", vm_name));
-        virt::wait_for_vm_running(client, namespace, vm_name, 300).await?;
+        virt::wait_for_vm_running(client, namespace, vm_name, 900).await?;
         test_ctx.info(format!("VM {} is Running", vm_name));
 
         test_ctx.info(format!("Waiting for SSH access to VM {}", vm_name));