From 34be8b3a00e1ba8ca4d5933c8ae33b4b7ada47ba Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Thu, 25 May 2023 15:05:18 -0300 Subject: [PATCH] ci: ensure `cluster.hocon` is removed before running tests --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 785458601..200fa7c71 100644 --- a/Makefile +++ b/Makefile @@ -104,7 +104,7 @@ APPS=$(shell $(SCRIPTS)/find-apps.sh) .PHONY: $(APPS:%=%-ct) define gen-app-ct-target -$1-ct: $(REBAR) merge-config +$1-ct: $(REBAR) merge-config clean-test-cluster-config $(eval SUITES := $(shell $(SCRIPTS)/find-suites.sh $1)) ifneq ($(SUITES),) @ENABLE_COVER_COMPILE=1 $(REBAR) ct -c -v \ @@ -127,7 +127,7 @@ endef $(foreach app,$(APPS),$(eval $(call gen-app-prop-target,$(app)))) .PHONY: ct-suite -ct-suite: $(REBAR) merge-config +ct-suite: $(REBAR) merge-config clean-test-cluster-config ifneq ($(TESTCASE),) ifneq ($(GROUP),) $(REBAR) ct -v --readable=$(CT_READABLE) --name $(CT_NODE_NAME) --suite $(SUITE) --case $(TESTCASE) --group $(GROUP) @@ -294,3 +294,7 @@ fmt: $(REBAR) @$(SCRIPTS)/erlfmt -w '{apps,lib-ee}/*/{src,include,test}/**/*.{erl,hrl,app.src}' @$(SCRIPTS)/erlfmt -w 'rebar.config.erl' @mix format + +.PHONY: clean-test-cluster-config +clean-test-cluster-config: + @rm apps/emqx_conf/data/configs/cluster.hocon || true