From d2516fe71adb771815361d0698425bb13310e08e Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Tue, 19 Jul 2022 13:22:20 +0100 Subject: [PATCH 1/6] Assert port in dashboard link --- dask_kubernetes/classic/tests/test_async.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dask_kubernetes/classic/tests/test_async.py b/dask_kubernetes/classic/tests/test_async.py index 33fb70219..d2113cbfb 100644 --- a/dask_kubernetes/classic/tests/test_async.py +++ b/dask_kubernetes/classic/tests/test_async.py @@ -144,6 +144,8 @@ async def test_diagnostics_link_env_variable(k8s_cluster, pod_spec, user_env): async with KubeCluster(pod_spec, asynchronous=True) as cluster: port = cluster.scheduler_info["services"]["dashboard"] + assert port in cluster.dashboard_link + assert ( "foo-" + getpass.getuser() + "-" + str(port) in cluster.dashboard_link ) From 0e81177cebc883fb6ac2558786e589f47570b304 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Tue, 19 Jul 2022 13:55:42 +0100 Subject: [PATCH 2/6] Fix test --- dask_kubernetes/classic/tests/test_async.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dask_kubernetes/classic/tests/test_async.py b/dask_kubernetes/classic/tests/test_async.py index d2113cbfb..597de7d87 100644 --- a/dask_kubernetes/classic/tests/test_async.py +++ b/dask_kubernetes/classic/tests/test_async.py @@ -144,7 +144,7 @@ async def test_diagnostics_link_env_variable(k8s_cluster, pod_spec, user_env): async with KubeCluster(pod_spec, asynchronous=True) as cluster: port = cluster.scheduler_info["services"]["dashboard"] - assert port in cluster.dashboard_link + assert str(port) in cluster.dashboard_link assert ( "foo-" + getpass.getuser() + "-" + str(port) in cluster.dashboard_link From ebc88efbd981c39a39e8d64333933a0c402e75ec Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Tue, 19 Jul 2022 14:46:47 +0100 Subject: [PATCH 3/6] Pin to last release --- ci/install-deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/install-deps.sh b/ci/install-deps.sh index 3d632a650..b15bff87a 100755 --- a/ci/install-deps.sh +++ b/ci/install-deps.sh @@ -5,5 +5,5 @@ mv istio-*/bin/istioctl /usr/local/bin/istioctl pip install -e . pip install -r requirements-test.txt -pip install git+https://github.com/dask/distributed@main -pip install git+https://github.com/dask/dask@main +pip install git+https://github.com/dask/distributed@2022.7.0 +pip install git+https://github.com/dask/dask@2022.7.0 From 3faff959184290fbafe58ab72d4d5d3fd4c6542e Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Tue, 19 Jul 2022 17:28:04 +0100 Subject: [PATCH 4/6] Pin to 2022.6.1 --- ci/Dockerfile | 4 ++-- ci/install-deps.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index b9b26b552..996e77707 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -1,5 +1,5 @@ FROM ghcr.io/dask/dask:latest # Install latest dev builds of Dask and Distributed -RUN pip install git+https://github.com/dask/distributed@main -RUN pip install git+https://github.com/dask/dask@main +RUN pip install git+https://github.com/dask/distributed@2022.6.1 +RUN pip install git+https://github.com/dask/dask@2022.6.1 diff --git a/ci/install-deps.sh b/ci/install-deps.sh index b15bff87a..07c9e842a 100755 --- a/ci/install-deps.sh +++ b/ci/install-deps.sh @@ -5,5 +5,5 @@ mv istio-*/bin/istioctl /usr/local/bin/istioctl pip install -e . pip install -r requirements-test.txt -pip install git+https://github.com/dask/distributed@2022.7.0 -pip install git+https://github.com/dask/dask@2022.7.0 +pip install git+https://github.com/dask/distributed@2022.6.1 +pip install git+https://github.com/dask/dask@2022.6.1 From e34e12db05d5a1e2f71b559cdb6ed877518911b0 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Fri, 29 Jul 2022 16:48:09 +0100 Subject: [PATCH 5/6] Revert pinning --- ci/Dockerfile | 4 ++-- ci/install-deps.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index 996e77707..b9b26b552 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -1,5 +1,5 @@ FROM ghcr.io/dask/dask:latest # Install latest dev builds of Dask and Distributed -RUN pip install git+https://github.com/dask/distributed@2022.6.1 -RUN pip install git+https://github.com/dask/dask@2022.6.1 +RUN pip install git+https://github.com/dask/distributed@main +RUN pip install git+https://github.com/dask/dask@main diff --git a/ci/install-deps.sh b/ci/install-deps.sh index 1953e9f7d..fce727469 100755 --- a/ci/install-deps.sh +++ b/ci/install-deps.sh @@ -7,5 +7,5 @@ mv istio-*/bin/istioctl /usr/local/bin/istioctl pip install -e . pip install -r requirements-test.txt -pip install git+https://github.com/dask/distributed@2022.6.1 -pip install git+https://github.com/dask/dask@2022.6.1 +pip install git+https://github.com/dask/distributed@main +pip install git+https://github.com/dask/dask@main From 724e95ef99bfc72e0c6d473efaed43ce0e6e5556 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Fri, 29 Jul 2022 16:48:24 +0100 Subject: [PATCH 6/6] Update test to check against the right port --- dask_kubernetes/classic/tests/test_async.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dask_kubernetes/classic/tests/test_async.py b/dask_kubernetes/classic/tests/test_async.py index 597de7d87..5bcc486c2 100644 --- a/dask_kubernetes/classic/tests/test_async.py +++ b/dask_kubernetes/classic/tests/test_async.py @@ -142,9 +142,7 @@ async def test_diagnostics_link_env_variable(k8s_cluster, pod_spec, user_env): pytest.importorskip("bokeh") with dask.config.set({"distributed.dashboard.link": "foo-{USER}-{port}"}): async with KubeCluster(pod_spec, asynchronous=True) as cluster: - port = cluster.scheduler_info["services"]["dashboard"] - - assert str(port) in cluster.dashboard_link + port = cluster.forwarded_dashboard_port assert ( "foo-" + getpass.getuser() + "-" + str(port) in cluster.dashboard_link