Merge pull request #36 from amirreza8002/cluster

add workflow to test cluster client

Author: amirreza8002

.github/workflows/ci.yml

@@ -63,6 +63,7 @@ jobs:
           path: ./custom-cache/
           fail-on-cache-miss: true
           key: custom-cache
+
       - name: Use Cache
         run: docker image load -i ./custom-cache/all.tar
 
@@ -83,8 +84,10 @@ jobs:
         run: |
           uv run invoke devenv
           chmod +x ./util/wait-for-it.sh
+
           ./util/wait-for-it.sh localhost:6379
-          
+          ./util/wait-for-it.sh localhost:7000
+
           uv run pytest tests/*.py --ds=tests.settings.sqlite -x
           uv run pytest tests/*.py --ds=tests.settings.sqlite_herd -x
           uv run pytest tests/*.py --ds=tests.settings.sqlite_json -x
@@ -99,6 +102,7 @@ jobs:
           uv run pytest tests/*.py --ds=tests.settings.sqlite_bz2 -x
           uv run pytest tests/tests_async/*.py --ds=tests.settings.sqlite_async -x
           uv run pytest tests/tests_async/*.py --ds=tests.settings.sqlite_async_herd -x
+          uv run pytest tests/*.py tests/tests_cluster --ds=tests.settings.sqlite_cluster -x
 #          uv run pytest tests/*.py --ds=tests.settings.sqlite_usock -x
 
         env:

compose.yaml

@@ -21,29 +21,90 @@ services:
       timeout: 5s
       retries: 5
 
+  valkey-node-0:
+    image: bitnami/valkey-cluster:8.1
+    environment:
+      - "VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5"
+      - "ALLOW_EMPTY_PASSWORD=yes"
+      - "VALKEY_RDB_POLICY_DISABLED=yes"
+      - "VALKEY_AOF_ENABLED=no"
+    ports:
+      - 7000:6379
+    profiles:
+      - cluster
+      - all
 
-  cluster:
-    container_name: valkey-cluster
-    build:
-      context: .
-      dockerfile: dockers/Dockerfile.cluster
+  valkey-node-1:
+    image: bitnami/valkey-cluster:8.1
+    environment:
+      - "VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5"
+      - "ALLOW_EMPTY_PASSWORD=yes"
+      - "VALKEY_RDB_POLICY_DISABLED=yes"
+      - "VALKEY_AOF_ENABLED=no"
+      - "VALKEY_PRIMARY_HOST=localhost"
     ports:
-      - 16379:16379
-      - 16380:16380
-      - 16381:16381
-      - 16382:16382
-      - 16383:16383
-      - 16384:16384
-    volumes:
-      - "./dockers/cluster.valkey.conf:/valkey.conf:ro"
+      - 7001:6379
     profiles:
       - cluster
       - all
 
+  valkey-node-2:
+    image: bitnami/valkey-cluster:8.1
     environment:
-      - VALKEY_CLUSTER=yes
-      - NODES=6
-      - REPLICAS=1
+      - "VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5"
+      - "ALLOW_EMPTY_PASSWORD=yes"
+      - "VALKEY_RDB_POLICY_DISABLED=yes"
+      - "VALKEY_AOF_ENABLED=no"
+    ports:
+      - 7002:6379
+    profiles:
+      - cluster
+      - all
+
+  valkey-node-3:
+    image: bitnami/valkey-cluster:8.1
+    environment:
+      - "VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5"
+      - "ALLOW_EMPTY_PASSWORD=yes"
+      - "VALKEY_RDB_POLICY_DISABLED=yes"
+      - "VALKEY_AOF_ENABLED=no"
+      - "VALKEY_PRIMARY_PORT_NUMBER=7002"
+      - "VALKEY_PRIMARY_HOST=localhost"
+    ports:
+      - 7003:6379
+    profiles:
+      - cluster
+      - all
+
+  valkey-node-4:
+    image: bitnami/valkey-cluster:8.1
+    environment:
+      - "VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5"
+      - "ALLOW_EMPTY_PASSWORD=yes"
+      - "VALKEY_RDB_POLICY_DISABLED=yes"
+      - "VALKEY_AOF_ENABLED=no"
+    ports:
+      - 7004:6379
+    profiles:
+      - cluster
+      - all
+
+  valkey-node-5:
+    image: bitnami/valkey-cluster:8.1
+    environment:
+      - "VALKEY_CLUSTER_REPLICAS=1"
+      - "VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5"
+      - "VALKEY_CLUSTER_CREATOR=yes"
+      - "ALLOW_EMPTY_PASSWORD=yes"
+      - "VALKEY_RDB_POLICY_DISABLED=yes"
+      - "VALKEY_AOF_ENABLED=no"
+      - "VALKEY_PRIMARY_PORT_NUMBER=7004"
+      - "VALKEY_PRIMARY_HOST=localhost"
+    ports:
+      - 7005:6379
+    profiles:
+      - cluster
+      - all
 
   sentinel:
     image: valkey/valkey:latest