fix(tests): Increase attestation timeout and update Makefile

The `test_attestation` test may time out while waiting for SSH access,
as VM boot can exceed the previous 300s limit. Increase the maximum
wait time to 600s to prevent this.

Also, update the `integration-tests` target in the Makefile to add
the `crds-rs` dependency and ensure the namespace is created before
applying the manifests. And fix the race condition in the tests.

Signed-off-by: Yalan Zhang <[email protected]>

Author: yalzhang

Makefile

@@ -134,6 +134,7 @@ endif
 	$(YQ) '.spec.publicTrusteeAddr = "$(TRUSTEE_ADDR):8080"' \
 		-i $(DEPLOY_PATH)/trusted_execution_cluster_cr.yaml
 	$(YQ) '.namespace = "$(NAMESPACE)"' -i config/rbac/kustomization.yaml
+	$(KUBECTL) create namespace $(NAMESPACE) || true
 	$(KUBECTL) apply -f $(DEPLOY_PATH)/operator.yaml
 	$(KUBECTL) apply -f config/crd
 	$(KUBECTL) apply -k config/rbac
@@ -171,7 +172,7 @@ test: crds-rs
 test-release: crds-rs
 	cargo test --workspace --bins --release
 
-integration-tests: generate trusted-cluster-gen
+integration-tests: generate trusted-cluster-gen crds-rs
 	RUST_LOG=info cargo test --test trusted_execution_cluster --test attestation \
 		--features virtualization -- --no-capture  --test-threads=1
 

test_utils/src/virt.rs

@@ -193,6 +193,7 @@ pub async fn create_kubevirt_vm(
                         },
                         "resources": {
                             "requests": {
+                                "cpu": "2",
                                 "memory": "4096M"
                             }
                         }

tests/attestation.rs

@@ -48,7 +48,7 @@ impl SingleAttestationContext {
         test_ctx.info(format!("VM {} is Running", vm_name));
 
         test_ctx.info(format!("Waiting for SSH access to VM {}", vm_name));
-        virt::wait_for_vm_ssh_ready(namespace, vm_name, &key_path, 300).await?;
+        virt::wait_for_vm_ssh_ready(namespace, vm_name, &key_path, 600).await?;
         test_ctx.info("SSH access is ready");
 
         Ok(Self {
@@ -148,8 +148,8 @@ async fn test_parallel_vm_attestation() -> anyhow::Result<()> {
     // Wait for SSH access on both VMs in parallel
     test_ctx.info("Waiting for SSH access on both VMs");
     let (ssh1_ready, ssh2_ready) = tokio::join!(
-        virt::wait_for_vm_ssh_ready(namespace, vm1_name, &key_path1, 300),
-        virt::wait_for_vm_ssh_ready(namespace, vm2_name, &key_path2, 300)
+        virt::wait_for_vm_ssh_ready(namespace, vm1_name, &key_path1, 900),
+        virt::wait_for_vm_ssh_ready(namespace, vm2_name, &key_path2, 900)
     );
 
     ssh1_ready?;
@@ -258,6 +258,7 @@ async fn test_vm_reboot_delete_machine() -> anyhow::Result<()> {
     let list = machines.list(&Default::default()).await?;
     let name = list.items[0].metadata.name.as_ref().unwrap();
     machines.delete(name, &Default::default()).await?;
+    wait_for_resource_deleted(&machines, name, 120, 5).await?;
 
     test_ctx.info("Performing reboot, expecting missing resource");
     let _reboot_result = virt::virtctl_ssh_exec(

tests/trusted_execution_cluster.rs

@@ -62,8 +62,10 @@ async fn test_image_pcrs_configmap_updates() -> anyhow::Result<()> {
 
                 if let Some(data) = &cm.data {
                     if let Some(image_pcrs_json) = data.get("image-pcrs.json") {
-                        if !image_pcrs_json.is_empty() {
-                            return Ok(());
+                        if let Ok(image_pcrs) = serde_json::from_str::<ImagePcrs>(image_pcrs_json) {
+                            if !image_pcrs.0.is_empty() {
+                                return Ok(());
+                            }
                         }
                     }
                 }