Update Feast Registry Rest Tests run on Openshift Env

Srihari1192 · ntkathole · commit 1858dafa94ad · 2026-03-10T12:29:06.000+05:30
Signed-off-by: Srihari &lt;svenkata@redhat.com&gt;
diff --git a/.github/workflows/registry-rest-api-tests.yml b/.github/workflows/registry-rest-api-tests.yml
@@ -149,7 +149,7 @@ jobs:
       - name: Setup and Run Registry Rest API tests
         run: |
           echo "Running Registry REST API tests..."
-          uv run pytest -c sdk/python/pytest.ini sdk/python/tests/integration/rest_api/test_registry_rest_api.py --integration -s
+          uv run pytest -c sdk/python/pytest.ini sdk/python/tests/integration/rest_api/test_registry_rest_api.py --integration -s --timeout=600
 
       - name: Clean up docker images
         if: always()
diff --git a/sdk/python/tests/integration/rest_api/conftest.py b/sdk/python/tests/integration/rest_api/conftest.py
@@ -15,7 +15,6 @@
     deploy_and_validate_pod,
     execPodCommand,
     get_pod_name_by_prefix,
-    run_kubectl_apply_with_sed,
     run_kubectl_command,
     validate_feature_store_cr_status,
 )
@@ -90,38 +89,42 @@ def feast_rest_client():
     namespace = "test-ns-feast-rest"
     credit_scoring = "credit-scoring"
     driver_ranking = "driver-ranking"
-    service_name = "feast-test-s3-registry-rest"
+    # Registry REST service name created by the operator for credit-scoring (kind and OpenShift)
+    registry_rest_service = "feast-credit-scoring-registry-rest"
     run_on_openshift = os.getenv("RUN_ON_OPENSHIFT_CI", "false").lower() == "true"
 
     # Create test namespace
     create_namespace(api_instance, namespace)
 
     try:
-        if not run_on_openshift:
-            # Deploy dependencies
-            deploy_and_validate_pod(
-                namespace, str(resource_dir / "redis.yaml"), "app=redis"
-            )
-            deploy_and_validate_pod(
-                namespace, str(resource_dir / "postgres.yaml"), "app=postgres"
-            )
-
-            # Create and validate FeatureStore CRs
-            create_feast_project(
-                str(resource_dir / "feast_config_credit_scoring.yaml"),
-                namespace,
-                credit_scoring,
-            )
-            validate_feature_store_cr_status(namespace, credit_scoring)
-
-            create_feast_project(
-                str(resource_dir / "feast_config_driver_ranking.yaml"),
-                namespace,
-                driver_ranking,
-            )
-            validate_feature_store_cr_status(namespace, driver_ranking)
-
-            # Deploy ingress and get route URL
+        # Deploy dependencies (same for kind and OpenShift)
+        deploy_and_validate_pod(
+            namespace, str(resource_dir / "redis.yaml"), "app=redis"
+        )
+        deploy_and_validate_pod(
+            namespace, str(resource_dir / "postgres.yaml"), "app=postgres"
+        )
+
+        # Create and validate FeatureStore CRs (SQL registry, same as kind)
+        create_feast_project(
+            str(resource_dir / "feast_config_credit_scoring.yaml"),
+            namespace,
+            credit_scoring,
+        )
+        validate_feature_store_cr_status(namespace, credit_scoring)
+
+        create_feast_project(
+            str(resource_dir / "feast_config_driver_ranking.yaml"),
+            namespace,
+            driver_ranking,
+        )
+        validate_feature_store_cr_status(namespace, driver_ranking)
+
+        if run_on_openshift:
+            # OpenShift: expose registry REST via route (no nginx ingress)
+            route_url = create_route(namespace, credit_scoring, registry_rest_service)
+        else:
+            # Kind: deploy nginx ingress and get route URL
             run_kubectl_command(
                 [
                     "apply",
@@ -144,40 +147,14 @@ def feast_rest_client():
             )
             route_url = f"http://{ingress_host}"
 
-            # Apply feast projects
+        # Apply feast projects
+        applyFeastProject(namespace, credit_scoring)
+        applyFeastProject(namespace, driver_ranking)
 
-            applyFeastProject(namespace, credit_scoring)
-
-            applyFeastProject(namespace, driver_ranking)
-
-            # Create Saved Datasets and Permissions
-            pod_name = get_pod_name_by_prefix(namespace, credit_scoring)
-
-            # Apply datasets
-            execPodCommand(
-                namespace, pod_name, ["python", "create_ui_visible_datasets.py"]
-            )
-
-            # Apply permissions
-            execPodCommand(namespace, pod_name, ["python", "permissions_apply.py"])
-
-        else:
-            # OpenShift cluster setup using S3-based registry
-            aws_access_key = os.getenv("AWS_ACCESS_KEY")
-            aws_secret_key = os.getenv("AWS_SECRET_KEY")
-            aws_bucket = os.getenv("AWS_BUCKET_NAME")
-            registry_path = os.getenv("AWS_REGISTRY_FILE_PATH")
-
-            run_kubectl_apply_with_sed(
-                aws_access_key,
-                aws_secret_key,
-                aws_bucket,
-                registry_path,
-                str(resource_dir / "feast_config_rhoai.yaml"),
-                namespace,
-            )
-            validate_feature_store_cr_status(namespace, "test-s3")
-            route_url = create_route(namespace, credit_scoring, service_name)
+        # Create Saved Datasets and Permissions
+        pod_name = get_pod_name_by_prefix(namespace, credit_scoring)
+        execPodCommand(namespace, pod_name, ["python", "create_ui_visible_datasets.py"])
+        execPodCommand(namespace, pod_name, ["python", "permissions_apply.py"])
         if not route_url:
             raise RuntimeError("Route URL could not be fetched.")
 
