Просмотр исходного кода

chore(CI): add password for redis cluster in actions

zhanghongtong 4 лет назад
Родитель
Сommit
0b904bb28b

+ 1 - 0
.ci/docker-compose-file/redis/redis-tls.conf

@@ -4,3 +4,4 @@ logfile /var/log/redis-server.log
 tls-cert-file /tls/redis.crt
 tls-key-file /tls/redis.key
 tls-ca-cert-file /tls/ca.crt
+requirepass public

+ 1 - 0
.ci/docker-compose-file/redis/redis.conf

@@ -1,3 +1,4 @@
 daemonize yes
 bind 0.0.0.0 ::
 logfile /var/log/redis-server.log
+requirepass public

+ 1 - 1
.ci/docker-compose-file/redis/redis.sh

@@ -80,7 +80,7 @@ do
         continue;
     fi
     if [ "${node}" = "cluster" ] ; then
-      yes "yes" | redis-cli --cluster create "$LOCAL_IP:7000" "$LOCAL_IP:7001" "$LOCAL_IP:7002";
+      yes "yes" | redis-cli --cluster create "$LOCAL_IP:7000" "$LOCAL_IP:7001" "$LOCAL_IP:7002" --pass public --no-auth-warning;
     elif [ "${node}" = "sentinel" ] ; then
       cp /data/conf/sentinel.conf /_sentinel.conf
       redis-server /_sentinel.conf --sentinel;

+ 1 - 1
.github/workflows/run_cts_tests.yaml

@@ -351,7 +351,6 @@ jobs:
         if: matrix.node_type == 'single' && matrix.connect_type == 'tls'
         run: |
           cat <<-EOF >> "$GITHUB_ENV"
-          EMQX_AUTH__REIDS__PASSWORD=public
           EMQX_AUTH__REDIS__TYPE=single
           EMQX_AUTH__REDIS__SERVER=${redis_${{ matrix.network_type }}_address}:6380
           EOF
@@ -377,6 +376,7 @@ jobs:
       - name: run test cases
         run: |
           export CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_
+          export EMQX_AUTH__REIDS__PASSWORD=public
           printenv > .env
           docker exec -i erlang sh -c "make ensure-rebar3"
           docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_redis"