From c1480ab52c37f8dc111c12e510859bcef4209348 Mon Sep 17 00:00:00 2001 From: zhanghongtong Date: Wed, 22 Dec 2021 09:40:09 +0800 Subject: [PATCH] ci(cts): use makefile target instead of the rebar command --- .github/workflows/run_cts_tests.yaml | 20 +++++--------------- Makefile | 2 +- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/.github/workflows/run_cts_tests.yaml b/.github/workflows/run_cts_tests.yaml index 53dd74b6a..fd074a18f 100644 --- a/.github/workflows/run_cts_tests.yaml +++ b/.github/workflows/run_cts_tests.yaml @@ -48,9 +48,7 @@ jobs: run: | export CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_ printenv > .env - docker exec -i erlang sh -c "make ensure-rebar3" - docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_ldap" - docker exec --env-file .env -i erlang sh -c "./rebar3 ct --dir apps/emqx_auth_ldap" + docker exec --env-file .env -i erlang sh -c ".make apps/emqx_auth_ldap-ct" - uses: actions/upload-artifact@v1 if: failure() with: @@ -117,9 +115,7 @@ jobs: run: | export CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_ printenv > .env - docker exec -i erlang sh -c "make ensure-rebar3" - docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_mongo" - docker exec --env-file .env -i erlang sh -c "./rebar3 ct --dir apps/emqx_auth_mongo" + docker exec --env-file .env -i erlang sh -c "make apps/emqx_auth_mongo-ct" - uses: actions/upload-artifact@v1 if: failure() with: @@ -199,9 +195,7 @@ jobs: run: | export CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_ printenv > .env - docker exec -i erlang sh -c "make ensure-rebar3" - docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_mysql" - docker exec --env-file .env -i erlang sh -c "./rebar3 ct --dir apps/emqx_auth_mysql" + docker exec --env-file .env -i erlang sh -c "make apps/emqx_auth_mysql-ct" - uses: actions/upload-artifact@v1 if: failure() with: @@ -273,9 +267,7 @@ jobs: EMQX_AUTH__PGSQL__DATABASE=mqtt \ CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_ printenv > .env - docker exec -i erlang sh -c "make ensure-rebar3" - docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_pgsql" - docker exec --env-file .env -i erlang sh -c "./rebar3 ct --dir apps/emqx_auth_pgsql" + docker exec --env-file .env -i erlang sh -c "make apps/emqx_auth_pgsql-ct" - uses: actions/upload-artifact@v1 if: failure() with: @@ -394,9 +386,7 @@ jobs: export CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_ export EMQX_AUTH__REIDS__PASSWORD=public printenv > .env - docker exec -i erlang sh -c "make ensure-rebar3" - docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_redis" - docker exec --env-file .env -i erlang sh -c "./rebar3 ct --dir apps/emqx_auth_redis" + docker exec --env-file .env -i erlang sh -c "make apps/emqx_auth_redis-ct" - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/Makefile b/Makefile index d6b4e9b33..61bd06ba2 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ APPS=$(shell $(CURDIR)/scripts/find-apps.sh) ## app/name-ct targets are intended for local tests hence cover is not enabled .PHONY: $(APPS:%=%-ct) define gen-app-ct-target -$1-ct: +$1-ct: $(REBAR) $(REBAR) ct --name 'test@127.0.0.1' -v --suite $(shell $(CURDIR)/scripts/find-suites.sh $1) endef $(foreach app,$(APPS),$(eval $(call gen-app-ct-target,$(app))))