Update: 测试

NHZEX · Mar 11, 2024 · 07d82b4 · 07d82b4
1 parent 73a43f7
commit 07d82b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml
@@ -137,8 +137,8 @@ services:
       KAFKA_BOOTSTRAP_SERVERS: "kafka1:9092"
       GITHUB_TOKEN: ${GITHUB_TOKEN}
       REDIS_SERVER_CLUSTER_PASSWORD: "l83aa26"
-      REDIS_SERVER_CLUSTER_SEEDS: "redis-cluster-node-0:6379,redis-cluster-node-1:6379,redis-cluster-node-2:6379,redis-cluster-node-3:6379,redis-cluster-node-4:6379,redis-cluster-node-5:6379"
-      REDIS_SERVER_TLS_CLUSTER_SEEDS: "redis-cluster-node-0:6443,redis-cluster-node-1:6443,redis-cluster-node-2:6443,redis-cluster-node-3:6443,redis-cluster-node-4:6443,redis-cluster-node-5:6443"
+      REDIS_SERVER_CLUSTER_SEEDS: "172.10.12.2:6379,172.10.12.3:6379,172.10.12.4:6379,172.10.12.5:6379,172.10.12.6:6379,172.10.12.7:6379"
+      REDIS_SERVER_TLS_CLUSTER_SEEDS: "172.10.12.2:6443,172.10.12.3:6443,172.10.12.4:6443,172.10.12.5:6443,172.10.12.6:6443,172.10.12.7:6443"
       REDIS_SERVER_UNIX_SOCK: "/run/shared/redis.sock"
       REDIS_SERVER_TLS_HOST: "redis-new"
       REDIS_SERVER_TLS_PORT: "6443"
@@ -175,8 +175,8 @@ services:
       KAFKA_BOOTSTRAP_SERVERS: "kafka1:9092"
       GITHUB_TOKEN: ${GITHUB_TOKEN}
       REDIS_SERVER_CLUSTER_PASSWORD: "l83aa26"
-      REDIS_SERVER_CLUSTER_SEEDS: "redis-cluster-node-0:6379,redis-cluster-node-1:6379,redis-cluster-node-2:6379,redis-cluster-node-3:6379,redis-cluster-node-4:6379,redis-cluster-node-5:6379"
-      REDIS_SERVER_TLS_CLUSTER_SEEDS: "redis-cluster-node-0:6443,redis-cluster-node-1:6443,redis-cluster-node-2:6443,redis-cluster-node-3:6443,redis-cluster-node-4:6443,redis-cluster-node-5:6443"
+      REDIS_SERVER_CLUSTER_SEEDS: "172.10.12.2:6379,172.10.12.3:6379,172.10.12.4:6379,172.10.12.5:6379,172.10.12.6:6379,172.10.12.7:6379"
+      REDIS_SERVER_TLS_CLUSTER_SEEDS: "172.10.12.2:6443,172.10.12.3:6443,172.10.12.4:6443,172.10.12.5:6443,172.10.12.6:6443,172.10.12.7:6443"
       REDIS_SERVER_UNIX_SOCK: "/run/shared/redis.sock"
       REDIS_SERVER_TLS_HOST: "redis-new"
       REDIS_SERVER_TLS_PORT: "6443"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,8 +64,8 @@ jobs:
           docker logs redis-new || true
           docker exec ${ENV_SERVICE} bash -c "ls -lha /run/shared"
           echo ">>> redis-cluster-node-0"
-          docker exec ${ENV_SERVICE} bash -c "echo -e 'auth l83aa26\r\ninfo server' | nc redis-cluster-node-0 6479 -w 1"
-          docker exec ${ENV_SERVICE} bash -c "echo -e 'auth l83aa26\r\ncluster info\r\ncluster nodes' | nc redis-cluster-node-0 6479 -w 1"
+          docker exec ${ENV_SERVICE} bash -c "echo -e 'auth l83aa26\r\ninfo server' | nc redis-cluster-node-0-1 6379 -w 1"
+          docker exec ${ENV_SERVICE} bash -c "echo -e 'auth l83aa26\r\ncluster info\r\ncluster nodes' | nc redis-cluster-node-0-1 6379 -w 1"
           echo ">>> redis-new"
           docker exec ${ENV_SERVICE} bash -c "echo -e 'auth l83aa26\r\ninfo server' | nc redis-new 6377 -w 1"
       - name: Test
@@ -204,15 +204,14 @@ jobs:
           docker logs redis-cluster-node-0
           docker logs redis-cluster-node-1
           echo ">>> ====="
-          docker exec redis-cluster-node-0 cat /bitnami/redis/data/nodes.conf
-          docker exec redis-cluster-node-1 cat /bitnami/redis/data/nodes.conf
           echo ">>> redis-new"
           echo -e 'auth l83aa26\r\ninfo server' | nc 127.0.0.1 6377 -w 1
           echo ">>> ====="
           docker compose -f ./.github/service/redis-cluster/docker-compose.yml logs
           echo ">>> redis-cluster"
           echo -e 'auth l83aa26\r\ninfo server' | nc 172.10.12.2 6379 -w 1
           echo -e 'auth l83aa26\r\ncluster info\r\ncluster nodes' | nc 172.10.12.2 6379 -w 1
+          docker compose exec -f ./.github/service/redis-cluster/docker-compose.yml node-0 cat /bitnami/redis/data/nodes.conf
       - name: Test
         if: ${{ env.test_prepared && always() }}
         run: composer test