RHOAIENG-63111: address PR comments

Author: pawelpaszki

scripts/migration/ray_cluster_migration.py

@@ -961,14 +961,20 @@ def _get_cluster_route(
                 print(f"    [DEBUG] Cluster-wide search failed: {e}")
             pass  # Will fall through to namespace search
 
-        # If cluster-wide search didn't find anything, try namespace-specific search
+        # If cluster-wide search didn't find anything, try namespace-specific search.
+        # HTTPRoutes are created in the RayCluster namespace; search it first when known.
         if not httproute:
-            search_namespaces = [
-                "redhat-ods-applications",
-                "opendatahub",
-                "default",
-                "ray-system",
-            ]
+            search_namespaces = list(
+                dict.fromkeys(
+                    ([namespace] if namespace else [])
+                    + [
+                        "redhat-ods-applications",
+                        "opendatahub",
+                        "default",
+                        "ray-system",
+                    ]
+                )
+            )
 
             for ns in search_namespaces:
                 try:
@@ -1008,7 +1014,9 @@ def _get_cluster_route(
 
         gateway_ref = parent_refs[0]
         gateway_name = gateway_ref.get("name")
-        gateway_namespace = gateway_ref.get("namespace")
+        # parentRefs[].namespace is optional; defaults to the HTTPRoute's namespace.
+        route_namespace = (httproute.get("metadata") or {}).get("namespace")
+        gateway_namespace = gateway_ref.get("namespace") or route_namespace
 
         if not gateway_name or not gateway_namespace:
             return None
@@ -1757,7 +1765,7 @@ def pre_upgrade(
         print(
             "may result in your Ray infrastructure becoming unavailable or unrecoverable."
         )
-        return []
+        sys.exit(1)
     elif all_passed:
         print("All pre-upgrade checks passed.\n")
     else:
@@ -1827,7 +1835,7 @@ def pre_upgrade(
             print(
                 "Please check that you have write permissions to the parent directory."
             )
-            return []
+            sys.exit(1)
 
     # Create subdirectories for RHOAI 2.x and 3.x compatible backups
     rhoai_2x_dir = os.path.join(output_dir, "rhoai-2.x")
@@ -1839,7 +1847,7 @@ def pre_upgrade(
                 os.makedirs(subdir)
             except OSError as e:
                 print(f"ERROR: Failed to create backup subdirectory '{subdir}': {e}")
-                return []
+                sys.exit(1)
 
     saved_files = []
 

tests/upgrade/03_ray_migration_pre_upgrade_finalize_test.py

@@ -29,13 +29,10 @@ def test_ray_migration_pre_upgrade_finalize(self):
             cluster_name=CLUSTER_NAME,
         )
 
-        if result.returncode != 0:
-            # Script may return non-zero on check failures after setting codeflare;
-            # still verify the critical DSC state.
-            print(
-                f"Migration pre-upgrade exited with code {result.returncode}; "
-                "verifying codeflare Removed anyway."
-            )
+        assert result.returncode == 0, (
+            f"Migration pre-upgrade exited with code {result.returncode}; "
+            "required pre-flight checks or backup steps failed."
+        )
 
         assert_codeflare_removed()
         assert_raycluster_pre_upgrade_artifacts_if_present()

tests/upgrade/conftest.py

@@ -54,11 +54,8 @@ def ensure_migration_pre_upgrade_finalize(request):
     )
     result = run_migration_pre_upgrade()
     if result.returncode != 0:
-        print(
-            f"Warning: migration pre-upgrade exited with code {result.returncode} "
-            "in session finalizer."
+        pytest.fail(
+            f"Migration pre-upgrade exited with code {result.returncode} "
+            "in session finalizer; required pre-flight checks or backup steps failed."
         )
-    try:
-        assert_codeflare_removed()
-    except AssertionError as e:
-        pytest.fail(str(e))
+    assert_codeflare_removed()