From 344837f634f830bd63f686fc3b432e16c17d9f39 Mon Sep 17 00:00:00 2001
From: Samantha Hughes <shughes.uk@gmail.com>
Date: Thu, 4 Aug 2022 15:54:46 -0700
Subject: [PATCH] sync

---
 .github/workflows/tests.yml      | 6 +++---
 conftest.py                      | 3 ++-
 tests/benchmarks/test_coiled.py  | 4 +++-
 tests/benchmarks/test_parquet.py | 1 +
 tests/stability/test_deadlock.py | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 506e73aa15..5d7207dbb3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -4,7 +4,7 @@ on:
     branches:
       - main
     tags:
-      - '*'
+      - "*"
   pull_request:
   schedule:
     # Runs "At 00:01" (see https://crontab.guru)
@@ -392,7 +392,7 @@ jobs:
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.RUNTIME_CI_BOT_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.RUNTIME_CI_BOT_AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: us-east-2  # this is needed for boto for some reason
+          AWS_DEFAULT_REGION: us-east-2 # this is needed for boto for some reason
           DB_NAME: benchmark.db
         run: |
           aws s3 cp s3://coiled-runtime-ci/benchmarks/$DB_NAME . || true
@@ -406,7 +406,7 @@ jobs:
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.RUNTIME_CI_BOT_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.RUNTIME_CI_BOT_AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: us-east-2  # this is needed for boto for some reason
+          AWS_DEFAULT_REGION: us-east-2 # this is needed for boto for some reason
           DB_NAME: benchmark.db
         run: |
           aws s3 cp $DB_NAME s3://coiled-runtime-ci/benchmarks/
diff --git a/conftest.py b/conftest.py
index 9b8c52fa14..bf2dea1a16 100644
--- a/conftest.py
+++ b/conftest.py
@@ -103,7 +103,7 @@ def get_coiled_software_name():
 dask.config.set(
     {
         "coiled.account": "dask-engineering",
-        "coiled.software": get_coiled_software_name(),
+        # "coiled.software": get_coiled_software_name(),
     }
 )
 
@@ -249,6 +249,7 @@ def small_cluster(request):
         worker_vm_types=["t3.large"],
         scheduler_vm_types=["t3.large"],
         backend_options=backend_options,
+        package_sync=True,
     ) as cluster:
         yield cluster
 
diff --git a/tests/benchmarks/test_coiled.py b/tests/benchmarks/test_coiled.py
index 30930f6c2f..ab0f3e5271 100644
--- a/tests/benchmarks/test_coiled.py
+++ b/tests/benchmarks/test_coiled.py
@@ -5,5 +5,7 @@
 
 def test_default_cluster_spinup_time(request):
 
-    with Cluster(name=f"{request.node.originalname}-{uuid.uuid4().hex[:8]}"):
+    with Cluster(
+        name=f"{request.node.originalname}-{uuid.uuid4().hex[:8]}", package_sync=True
+    ):
         pass
diff --git a/tests/benchmarks/test_parquet.py b/tests/benchmarks/test_parquet.py
index 936c6e0da6..87b9b64d63 100644
--- a/tests/benchmarks/test_parquet.py
+++ b/tests/benchmarks/test_parquet.py
@@ -21,6 +21,7 @@ def parquet_cluster():
         n_workers=N_WORKERS,
         worker_vm_types=["m5.xlarge"],
         scheduler_vm_types=["m5.xlarge"],
+        package_sync=True,
     ) as cluster:
         yield cluster
 
diff --git a/tests/stability/test_deadlock.py b/tests/stability/test_deadlock.py
index 31e262bb7f..df27f6e935 100644
--- a/tests/stability/test_deadlock.py
+++ b/tests/stability/test_deadlock.py
@@ -18,6 +18,7 @@ def test_repeated_merge_spill(upload_cluster_dump):
         name=f"test_deadlock-{uuid.uuid4().hex}",
         n_workers=20,
         worker_vm_types=["t3.medium"],
+        package_sync=True,
     ) as cluster:
         with Client(cluster) as client:
             with upload_cluster_dump(client, cluster):