From 0f85713174150044e17d2c4dfbcaaf7f7475f333 Mon Sep 17 00:00:00 2001 From: Binbin Date: Tue, 22 Nov 2022 04:53:13 +0800 Subject: [PATCH] Fix sentinel update loglevel tls test (#11528) Apparently we used to set `loglevel debug` for tls in spawn_instance. I.e. cluster and sentinel tests used to run with debug logging, only when tls mode was enabled. this was probably a leftover from when creating the tls mode tests. it cause a new test created for #11214 to fail in tls mode. At the same time, in order to better distinguish the tests, change the name of `test-centos7-tls` to `test-centos7-tls-module`, change the name of `test-centos7-tls-no-tls` to `test-centos7-tls-module-no-tls`. Note that in `test-centos7-tls-module`, we did not pass `--tls-module` in sentinel test because it is not supported, see 4faddf1, added in #9320. So only `test-ubuntu-tls` fails in daily CI. Co-authored-by: Oran Agra --- .github/workflows/daily.yml | 4 ++-- tests/instances.tcl | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 72830cf42..414f99f67 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -518,7 +518,7 @@ jobs: if: true && !contains(github.event.inputs.skiptests, 'cluster') run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}} - test-centos7-tls: + test-centos7-tls-module: runs-on: ubuntu-latest if: | (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'redis/redis')) && @@ -561,7 +561,7 @@ jobs: run: | ./runtest-cluster --tls-module ${{github.event.inputs.cluster_test_args}} - test-centos7-tls-no-tls: + test-centos7-tls-module-no-tls: runs-on: ubuntu-latest if: | (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'redis/redis')) && diff --git a/tests/instances.tcl b/tests/instances.tcl index 9cbb11a92..4e4091c31 100644 --- a/tests/instances.tcl +++ b/tests/instances.tcl @@ -102,7 +102,6 @@ proc spawn_instance {type base_port count {conf {}} {base_conf_file ""}} { puts $cfg [format "tls-client-key-file %s/../../tls/client.key" [pwd]] puts $cfg [format "tls-dh-params-file %s/../../tls/redis.dh" [pwd]] puts $cfg [format "tls-ca-cert-file %s/../../tls/ca.crt" [pwd]] - puts $cfg "loglevel debug" } else { puts $cfg "port $port" }