diff --git a/apps/emqx_enterprise/src/emqx_enterprise_schema.erl b/apps/emqx_enterprise/src/emqx_enterprise_schema.erl index 571757c75..2665afcf7 100644 --- a/apps/emqx_enterprise/src/emqx_enterprise_schema.erl +++ b/apps/emqx_enterprise/src/emqx_enterprise_schema.erl @@ -5,7 +5,6 @@ -module(emqx_enterprise_schema). -behaviour(hocon_schema). --behaviour(emqx_schema_hooks). -include_lib("typerefl/include/types.hrl"). -include_lib("hocon/include/hoconsc.hrl"). diff --git a/apps/emqx_management/test/emqx_mgmt_api_cluster_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_cluster_SUITE.erl index 113468f0b..135d2103a 100644 --- a/apps/emqx_management/test/emqx_mgmt_api_cluster_SUITE.erl +++ b/apps/emqx_management/test/emqx_mgmt_api_cluster_SUITE.erl @@ -24,7 +24,12 @@ -define(APPS, [emqx_conf, emqx_management]). all() -> - emqx_common_test_helpers:all(?MODULE). + case emqx_cth_suite:skip_if_oss() of + false -> + emqx_common_test_helpers:all(?MODULE); + True -> + True + end. init_per_suite(Config) -> Config. diff --git a/apps/emqx_management/test/emqx_mgmt_api_data_backup_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_data_backup_SUITE.erl index 6a580fd57..994d34798 100644 --- a/apps/emqx_management/test/emqx_mgmt_api_data_backup_SUITE.erl +++ b/apps/emqx_management/test/emqx_mgmt_api_data_backup_SUITE.erl @@ -36,7 +36,12 @@ ). all() -> - emqx_common_test_helpers:all(?MODULE). + case emqx_cth_suite:skip_if_oss() of + false -> + emqx_common_test_helpers:all(?MODULE); + True -> + True + end. init_per_suite(Config) -> Config. diff --git a/apps/emqx_management/test/emqx_mgmt_data_backup_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_data_backup_SUITE.erl index 9a3d3971c..80fac8c30 100644 --- a/apps/emqx_management/test/emqx_mgmt_data_backup_SUITE.erl +++ b/apps/emqx_management/test/emqx_mgmt_data_backup_SUITE.erl @@ -52,7 +52,12 @@ >>). all() -> - emqx_common_test_helpers:all(?MODULE). + case emqx_cth_suite:skip_if_oss() of + false -> + emqx_common_test_helpers:all(?MODULE); + True -> + True + end. init_per_suite(Config) -> Config.