From cad787a909d47ab191cb7cfd39e3d695b73e7034 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 23 Aug 2023 15:07:12 +0100
Subject: [PATCH 1/2] Removing old docker-compose.test.yaml that was causing
 flakiness and getting worker using mock redis.

---
 hosting/docker-compose.test.yaml           | 47 ----------------------
 hosting/{dependencies => tests}/Dockerfile |  0
 hosting/{dependencies => tests}/README.md  |  0
 hosting/{dependencies => tests}/runner.sh  |  0
 packages/worker/src/tests/jestEnv.ts       |  2 +-
 5 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 hosting/docker-compose.test.yaml
 rename hosting/{dependencies => tests}/Dockerfile (100%)
 rename hosting/{dependencies => tests}/README.md (100%)
 rename hosting/{dependencies => tests}/runner.sh (100%)

diff --git a/hosting/docker-compose.test.yaml b/hosting/docker-compose.test.yaml
deleted file mode 100644
index f059173d2d..0000000000
--- a/hosting/docker-compose.test.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-version: "3"
-
-# optional ports are specified throughout for more advanced use cases.
-
-services:
-  minio-service:
-    restart: on-failure
-    # Last version that supports the "fs" backend
-    image: minio/minio:RELEASE.2022-10-24T18-35-07Z
-    ports:
-      - "9000"
-      - "9001"
-    environment:
-      MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY}
-      MINIO_SECRET_KEY: ${MINIO_SECRET_KEY}
-    command: server /data --console-address ":9001"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
-      interval: 30s
-      timeout: 20s
-      retries: 3
-
-  couchdb-service:
-    # platform: linux/amd64
-    restart: on-failure
-    image: budibase/couchdb
-    environment:
-      - COUCHDB_PASSWORD=${COUCH_DB_PASSWORD}
-      - COUCHDB_USER=${COUCH_DB_USER}
-    ports:
-      - "5984"
-      - "4369"
-      - "9100"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:5984/_up"]
-      interval: 30s
-      timeout: 20s
-      retries: 3
-
-  redis-service:
-    restart: on-failure
-    image: redis
-    command: redis-server --requirepass ${REDIS_PASSWORD}
-    ports:
-      - "6379"
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
\ No newline at end of file
diff --git a/hosting/dependencies/Dockerfile b/hosting/tests/Dockerfile
similarity index 100%
rename from hosting/dependencies/Dockerfile
rename to hosting/tests/Dockerfile
diff --git a/hosting/dependencies/README.md b/hosting/tests/README.md
similarity index 100%
rename from hosting/dependencies/README.md
rename to hosting/tests/README.md
diff --git a/hosting/dependencies/runner.sh b/hosting/tests/runner.sh
similarity index 100%
rename from hosting/dependencies/runner.sh
rename to hosting/tests/runner.sh
diff --git a/packages/worker/src/tests/jestEnv.ts b/packages/worker/src/tests/jestEnv.ts
index fc92bbbf23..9153676b8e 100644
--- a/packages/worker/src/tests/jestEnv.ts
+++ b/packages/worker/src/tests/jestEnv.ts
@@ -9,4 +9,4 @@ process.env.MINIO_SECRET_KEY = "test"
 process.env.PLATFORM_URL = "http://localhost:10000"
 process.env.INTERNAL_API_KEY = "tet"
 process.env.DISABLE_ACCOUNT_PORTAL = "0"
-process.env.REDIS_PASSWORD = "budibase"
+process.env.MOCK_REDIS = "1"

From 42c6434260b2b263212ffba700c9c976cc18f78d Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 23 Aug 2023 14:07:37 +0000
Subject: [PATCH 2/2] Bump version to 2.9.30-alpha.10

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index a5b5a4a968..4708c54fdc 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.9.30-alpha.9",
+  "version": "2.9.30-alpha.10",
   "npmClient": "yarn",
   "packages": [
     "packages/*"