Add shared_roster_SUITE to dynamic_domains spec

It needs LDAP, and the preset needs RDMBS to run with the dynamic_domains spec.
esl · Feb 23, 2022 · c706a4f · c706a4f
1 parent 4123c02
commit c706a4f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/.circleci/template.yml b/.circleci/template.yml
@@ -213,11 +213,13 @@ executors:
       - image: *OTP23
       - *redis_container
       - *ldap_container
+      - *pgsql_container
   otp_24_ldap_redis:
     docker:
       - image: *OTP24
       - *redis_container
       - *ldap_container
+      - *pgsql_container
   otp_24_mssql_redis:
     docker:
       - image: *OTP24
@@ -827,7 +829,7 @@ workflows:
           executor: otp_23_ldap_redis
           context: mongooseim-org
           preset: ldap_mnesia
-          db: "ldap redis"
+          db: "ldap redis pgsql"
           requires:
             - otp_23_docker
           filters: *all_tags
@@ -836,7 +838,7 @@ workflows:
           executor: otp_24_ldap_redis
           context: mongooseim-org
           preset: ldap_mnesia
-          db: "ldap redis"
+          db: "ldap redis pgsql"
           requires:
             - otp_24_docker
           filters: *all_tags

diff --git a/big_tests/dynamic_domains.spec b/big_tests/dynamic_domains.spec
@@ -123,6 +123,8 @@
  [xmpp_components_are_reported],
  "at the moment external components doesn't support dynamic domains"}.
 
+{suites, "tests", shared_roster_SUITE}.
+
 {suites, "tests", sic_SUITE}.
 
 {suites, "tests", sm_SUITE}.

diff --git a/big_tests/run_common_test.erl b/big_tests/run_common_test.erl
@@ -179,7 +179,7 @@ run_test(Test, PresetsToRun, CoverOpts) ->
                                             end, Presets)
                        end,
             Length = length(Presets1),
-            Names = preset_names(Presets),
+            Names = preset_names(Presets1),
             error_logger:info_msg("Starting test of ~p configurations: ~n~p~n",
                                   [Length, Names]),
             Zip = lists:zip(lists:seq(1, Length), Presets1),

diff --git a/big_tests/test.config b/big_tests/test.config
@@ -301,9 +301,23 @@
   host = \"vjud.@HOST@\"\n"},
       {mod_roster, "  backend = \"rdbms\"\n"}]},
     {ldap_mnesia,
-     [{dbs, [redis, ldap]},
+     [{dbs, [redis, ldap, pgsql]},
+      {service_domain_db, ""},
       {auth_method, "ldap"},
-      {outgoing_pools, "[outgoing_pools.redis.global_distrib]
+      {outgoing_pools, "
+[outgoing_pools.rdbms.default]
+  scope = \"global\"
+  workers = 5
+  connection.driver = \"pgsql\"
+  connection.host = \"localhost\"
+  connection.database = \"ejabberd\"
+  connection.username = \"ejabberd\"
+  connection.password = \"mongooseim_secret\"
+  connection.tls.required = true
+  connection.tls.verify_peer = true
+  connection.tls.cacertfile = \"priv/ssl/cacert.pem\"
+  connection.tls.server_name_indication = false
+      [outgoing_pools.redis.global_distrib]
   scope = \"global\"
   workers = 10
 [outgoing_pools.ldap.default]