Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add test fixture for k8s docker cluster #1185

Merged
merged 1 commit into from
Aug 29, 2024
Merged

Add test fixture for k8s docker cluster #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion runhouse/resources/hardware/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,9 @@ def client(self):
f"Could not reach cluster {self.name} ({self.ips}). Is it up?"
)

connect_call = threading.Thread(target=self.connect_server_client)
connect_call = threading.Thread(
target=self.connect_server_client, kwargs={"force_reconnect": True}
)
connect_call.start()
connect_call.join(timeout=5)
if connect_call.is_alive():
Expand Down
3 changes: 3 additions & 0 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ def event_loop():
ondemand_cluster, # noqa: F401
ondemand_gcp_cluster, # noqa: F401
ondemand_k8s_cluster, # noqa: F401
ondemand_k8s_docker_cluster, # noqa: F401
v100_gpu_cluster, # noqa: F401
)

Expand Down Expand Up @@ -373,6 +374,7 @@ def event_loop():
"ondemand_aws_cluster",
"ondemand_gcp_cluster",
"ondemand_k8s_cluster",
"ondemand_k8s_docker_cluster",
"ondemand_aws_https_cluster_with_auth",
"static_cpu_pwd_cluster",
]
Expand All @@ -385,6 +387,7 @@ def event_loop():
"ondemand_aws_cluster",
"ondemand_gcp_cluster",
"ondemand_k8s_cluster",
"ondemand_k8s_docker_cluster",
"ondemand_aws_https_cluster_with_auth",
"multinode_cpu_cluster",
"static_cpu_pwd_cluster",
Expand Down
21 changes: 20 additions & 1 deletion tests/fixtures/on_demand_cluster_fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@ def setup_test_cluster(args, request, create_env=False):
"ondemand_aws_cluster",
"ondemand_gcp_cluster",
"ondemand_k8s_cluster",
"ondemand_k8s_docker_cluster",
"v100_gpu_cluster",
"k80_gpu_cluster",
"a10g_gpu_cluster",
],
ids=["aws_cpu", "gcp_cpu", "k8s_cpu", "v100", "k80", "a10g"],
ids=["aws_cpu", "gcp_cpu", "k8s_cpu", "k8s_docker_cpu", "v100", "k80", "a10g"],
)
def ondemand_cluster(request):
return request.getfixturevalue(request.param)
Expand Down Expand Up @@ -128,6 +129,24 @@ def ondemand_k8s_cluster(request):
return cluster


@pytest.fixture(scope="session")
def ondemand_k8s_docker_cluster(request):
kube_config_path = Path.home() / ".kube" / "config"

if not kube_config_path.exists():
pytest.skip("no kubeconfig found")

args = {
"name": "k8s-docker-cpu",
"provider": "kubernetes",
"instance_type": "CPU:1",
"memory": ".2",
"image_id": "docker:rayproject/ray:latest-py311-cpu",
}
cluster = setup_test_cluster(args, request)
return cluster


@pytest.fixture(scope="session")
def v100_gpu_cluster(request):
args = {"name": "rh-v100", "instance_type": "V100:1", "provider": "aws"}
Expand Down
2 changes: 2 additions & 0 deletions tests/test_obj_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"ondemand_aws_cluster",
"ondemand_gcp_cluster",
"ondemand_k8s_cluster",
"ondemand_k8s_docker_cluster",
"ondemand_aws_https_cluster_with_auth",
"static_cpu_pwd_cluster",
]
Expand All @@ -40,6 +41,7 @@
"ondemand_aws_cluster",
"ondemand_gcp_cluster",
"ondemand_k8s_cluster",
"ondemand_k8s_docker_cluster",
"ondemand_aws_https_cluster_with_auth",
"multinode_cpu_cluster",
"static_cpu_pwd_cluster",
Expand Down
2 changes: 2 additions & 0 deletions tests/test_resources/test_clusters/test_on_demand_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,15 @@ class TestOnDemandCluster(tests.test_resources.test_clusters.test_cluster.TestCl
"ondemand_gcp_cluster",
"ondemand_aws_https_cluster_with_auth",
"ondemand_k8s_cluster",
"ondemand_k8s_docker_cluster",
]
}
MAXIMAL = {
"cluster": [
"ondemand_aws_cluster",
"ondemand_gcp_cluster",
"ondemand_k8s_cluster",
"ondemand_k8s_docker_cluster",
"ondemand_aws_https_cluster_with_auth",
"v100_gpu_cluster",
"k80_gpu_cluster",
Expand Down
1 change: 1 addition & 0 deletions tests/test_resources/test_envs/test_env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ class TestEnv(tests.test_resources.test_resource.TestResource):
"ondemand_aws_cluster",
"ondemand_gcp_cluster",
"ondemand_k8s_cluster",
"ondemand_k8s_docker_cluster",
"ondemand_aws_https_cluster_with_auth",
"static_cpu_pwd_cluster",
"multinode_cpu_cluster",
Expand Down
1 change: 1 addition & 0 deletions tests/test_resources/test_secrets/test_secret.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ class TestSecret(tests.test_resources.test_resource.TestResource):
"ondemand_aws_cluster",
"ondemand_gcp_cluster",
"ondemand_k8s_cluster",
"ondemand_k8s_docker_cluster",
"ondemand_aws_https_cluster_with_auth",
"static_cpu_pwd_cluster",
"multinode_cpu_cluster",
Expand Down
Loading