From c7cafd097838bb832b203feef7579c1052571d4b Mon Sep 17 00:00:00 2001
From: Nat Tabris <nat@coiled.io>
Date: Thu, 10 Nov 2022 16:03:27 -0700
Subject: [PATCH] Use spot + fallback + multizone for all clusters

---
 tests/benchmarks/test_parquet.py | 6 +++++-
 tests/stability/conftest.py      | 4 +++-
 tests/stability/test_spill.py    | 6 +++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/tests/benchmarks/test_parquet.py b/tests/benchmarks/test_parquet.py
index e1e3d4613b..8303819d5a 100644
--- a/tests/benchmarks/test_parquet.py
+++ b/tests/benchmarks/test_parquet.py
@@ -23,7 +23,11 @@ def parquet_cluster(dask_env_variables, gitlab_cluster_tags):
         scheduler_vm_types=["m5.xlarge"],
         package_sync=True,
         environ=dask_env_variables,
-        backend_options={"send_prometheus_metrics": True},
+        backend_options={
+            "spot": True,
+            "spot_on_demand_fallback": True,
+            "multizone": True,
+        },
         tags=gitlab_cluster_tags,
     ) as cluster:
         yield cluster
diff --git a/tests/stability/conftest.py b/tests/stability/conftest.py
index 1ecf9b4ac9..40c25c4df8 100644
--- a/tests/stability/conftest.py
+++ b/tests/stability/conftest.py
@@ -3,7 +3,9 @@
 
 def pytest_collection_modifyitems(config, items):
     # Ensure stability tests use spot instances by default
-    marker = pytest.mark.backend_options(spot=True, spot_on_demand_fallback=True)
+    marker = pytest.mark.backend_options(
+        spot=True, spot_on_demand_fallback=True, multizone=True
+    )
     for item in items:
         # Add a module-level `spot=True` backend option marker if one doesn't already exist
         module = item.parent
diff --git a/tests/stability/test_spill.py b/tests/stability/test_spill.py
index 1cbb5fd2cc..cdad87716b 100644
--- a/tests/stability/test_spill.py
+++ b/tests/stability/test_spill.py
@@ -17,7 +17,11 @@ def spill_cluster(dask_env_variables, gitlab_cluster_tags):
         worker_vm_types=["m6i.large"],
         scheduler_vm_types=["m6i.xlarge"],
         wait_for_workers=True,
-        backend_options={"send_prometheus_metrics": True},
+        backend_options={
+            "spot": True,
+            "spot_on_demand_fallback": True,
+            "multizone": True,
+        },
         environ=merge(
             dask_env_variables,
             {