From d570178ccee22ae4352b1e3994d654e7ca8b9f22 Mon Sep 17 00:00:00 2001
From: Daniel Gafni <danielgafni16@gmail.com>
Date: Mon, 7 Oct 2024 15:32:08 +0200
Subject: [PATCH] fix tests

---
 .github/workflows/CI.yml                        | 4 ++--
 dagster_ray/kuberay/client/raycluster/client.py | 2 ++
 tests/kuberay/conftest.py                       | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index e1797b5..661d4e5 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -50,9 +50,10 @@ jobs:
         with:
           start: false
           driver: docker
+          #- uses: mxschmitt/action-tmate@v3
       - name: Run tests
         env:
-          PYTEST_KUBERAY_VERSIONS: "1.0.0,1.1.0"  # will run tests for all these KubeRay versions
+          PYTEST_KUBERAY_VERSIONS: "1.1.0,1.2.2"  # will run tests for all these KubeRay versions
         run: uv run pytest -v .
 
   lint:
@@ -64,7 +65,6 @@ jobs:
         os:
           - Ubuntu
         py:
-#          - "3.12"
           - "3.11"
           - "3.10"
           - "3.9"
diff --git a/dagster_ray/kuberay/client/raycluster/client.py b/dagster_ray/kuberay/client/raycluster/client.py
index 9890a5f..0e15179 100644
--- a/dagster_ray/kuberay/client/raycluster/client.py
+++ b/dagster_ray/kuberay/client/raycluster/client.py
@@ -141,6 +141,8 @@ def wait_until_ready(
                 and item["metadata"].get("name") == name  # type: ignore
                 and status.get("state") == "ready"
                 and status.get("head")
+                and status.get("head", {}).get("serviceName")
+                and status.get("endpoints", {}).get("dashboard")
             ):
                 if image is not None:
                     if (
diff --git a/tests/kuberay/conftest.py b/tests/kuberay/conftest.py
index 3e57091..9fe7d0e 100644
--- a/tests/kuberay/conftest.py
+++ b/tests/kuberay/conftest.py
@@ -70,7 +70,7 @@ def dagster_ray_image():
 # probably should only do it in CI
 KUBERNETES_VERSION = os.getenv("PYTEST_KUBERNETES_VERSION", "1.31.0")
 
-KUBERAY_VERSIONS = os.getenv("PYTEST_KUBERAY_VERSIONS", "1.2.0").split(",")
+KUBERAY_VERSIONS = os.getenv("PYTEST_KUBERAY_VERSIONS", "1.2.2").split(",")
 
 NAMESPACE = "ray"