RHOAIENG-61469: fix missing label causing upgrade tests to fail

Author: pawelpaszki

Makefile

@@ -7,7 +7,7 @@ E2E_TEST_IMAGE ?= quay.io/opendatahub/codeflare-sdk-tests:${E2E_TEST_IMAGE_VERSI
 build-test-image:
 	@echo "Building test image: $(E2E_TEST_IMAGE)"
 	# Build the Docker image using podman
-	podman build -f images/tests/Dockerfile -t $(E2E_TEST_IMAGE) .
+	podman build --platform linux/amd64 -f images/tests/Dockerfile -t $(E2E_TEST_IMAGE) .
 
 # Push the test image
 .PHONY: push-test-image

tests/e2e/support.py

@@ -286,20 +286,35 @@ def create_new_local_queue(self, num_queues):
         self.local_queues.append(local_queue_name)
 
 
-def create_namespace_with_name(self, namespace_name):
+def create_namespace_with_name(self, namespace_name, kueue_managed=True):
     self.namespace = namespace_name
+    labels = {"kueue.openshift.io/managed": "true"} if kueue_managed else {}
     try:
         namespace_body = client.V1Namespace(
-            metadata=client.V1ObjectMeta(name=self.namespace)
+            metadata=client.V1ObjectMeta(
+                name=self.namespace,
+                labels=labels,
+            )
         )
         self.api_instance.create_namespace(namespace_body)
     except Exception as e:
         # Check if it's an AlreadyExists error (409 Conflict) and ignore it
         if hasattr(e, "status") and e.status == 409:
-            # Namespace already exists, which is fine - just continue
             print(
                 f"Warning: Namespace '{namespace_name}' already exists, continuing..."
             )
+            if kueue_managed:
+                try:
+                    self.api_instance.patch_namespace(
+                        namespace_name,
+                        {
+                            "metadata": {
+                                "labels": {"kueue.openshift.io/managed": "true"}
+                            }
+                        },
+                    )
+                except Exception:
+                    pass
             return
         return _kube_api_error_handling(e)
 

tests/ui/pages/distributed_workloads_page.py

@@ -1005,7 +1005,7 @@ def verify_cluster_in_workload_list(self, cluster_name):
             # Look for the cluster name in the table
             cluster_cell = self.wait.until(
                 EC.presence_of_element_located(
-                    (By.XPATH, f"//td[contains(text(), '{cluster_name}')]")
+                    (By.XPATH, f"//td[contains(., '{cluster_name}')]")
                 )
             )
             is_visible = cluster_cell.is_displayed()

tests/upgrade/01_raycluster_sdk_upgrade_test.py

@@ -27,6 +27,9 @@ def setup_method(self):
             create_cluster_queue(self, cluster_queue, flavor)
             create_resource_flavor(self, flavor)
             create_local_queue(self, cluster_queue, local_queue)
+            # Populate plural lists used by delete_kueue_resources
+            self.cluster_queues = [cluster_queue]
+            self.resource_flavors = [flavor]
         except Exception as e:
             delete_namespace(self)
             delete_kueue_resources(self)
@@ -80,6 +83,7 @@ def run_mnist_raycluster_sdk_oauth(self):
                 worker_memory_requests=6,
                 worker_memory_limits=8,
                 image=ray_image,
+                local_queue=local_queue,
                 write_to_file=True,
                 verify_tls=False,
             )