From c3635f537a7dbc7da45248646caa45f7ca4206af Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Mon, 2 Jan 2023 20:37:38 +0100
Subject: [PATCH] ci: wait for redis in emqx_ee_bridge_redis_SUITE

---
 .../test/emqx_connector_redis_SUITE.erl            |  6 +++---
 .../test/emqx_ee_bridge_redis_SUITE.erl            | 14 ++++++++++----
 scripts/ct/run.sh                                  |  1 -
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/apps/emqx_connector/test/emqx_connector_redis_SUITE.erl b/apps/emqx_connector/test/emqx_connector_redis_SUITE.erl
index 060340fed..a1d8fe9d5 100644
--- a/apps/emqx_connector/test/emqx_connector_redis_SUITE.erl
+++ b/apps/emqx_connector/test/emqx_connector_redis_SUITE.erl
@@ -75,9 +75,9 @@ wait_for_redis(Checks) ->
             wait_for_redis(Checks - 1)
     end.
 
-% %%------------------------------------------------------------------------------
-% %% Testcases
-% %%------------------------------------------------------------------------------
+%%------------------------------------------------------------------------------
+%% Testcases
+%%------------------------------------------------------------------------------
 
 t_single_lifecycle(_Config) ->
     perform_lifecycle_check(
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_redis_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_redis_SUITE.erl
index 05f066d1a..c3529ddeb 100644
--- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_redis_SUITE.erl
+++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_redis_SUITE.erl
@@ -80,6 +80,12 @@ end_per_group(_Group, _Config) ->
     ok.
 
 init_per_suite(Config) ->
+    wait_for_ci_redis(redis_checks(), Config).
+
+wait_for_ci_redis(0, _Config) ->
+    throw(no_redis);
+wait_for_ci_redis(Checks, Config) ->
+    timer:sleep(1000),
     TestHosts = all_test_hosts(),
     case emqx_common_test_helpers:is_all_tcp_servers_available(TestHosts) of
         true ->
@@ -97,15 +103,15 @@ init_per_suite(Config) ->
                 | Config
             ];
         false ->
-            assert_ci()
+            wait_for_ci_redis(Checks - 1, Config)
     end.
 
-assert_ci() ->
+redis_checks() ->
     case os:getenv("IS_CI") of
         "yes" ->
-            throw(no_redis);
+            10;
         _ ->
-            {skip, no_redis}
+            1
     end.
 
 end_per_suite(_Config) ->
diff --git a/scripts/ct/run.sh b/scripts/ct/run.sh
index 7fb9e00fd..3a7b40317 100755
--- a/scripts/ct/run.sh
+++ b/scripts/ct/run.sh
@@ -11,7 +11,6 @@ help() {
     echo
     echo "-h|--help:              To display this usage info"
     echo "--app lib_dir/app_name: For which app to run start docker-compose, and run common tests"
-    echo "--suites SUITE1,SUITE2: Comma separated SUITE names to run. e.g. apps/emqx/test/emqx_SUITE.erl"
     echo "--console:              Start EMQX in console mode but do not run test cases"
     echo "--attach:               Attach to the Erlang docker container without running any test case"
     echo "--stop:                 Stop running containers for the given app"