yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6519 from Rory-Z/ci/update-cts-4.3 

ci(cts): use makefile target instead of the rebar command
This commit is contained in:
tigercl 2022-01-04 10:40:34 +08:00 committed by GitHub
parent bec742b1be 5fbd999ef8
commit 38a46e1af3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
.github/workflows/run_cts_tests.yaml vendored
View File

@ -3,6 +3,7 @@ name: Compatibility Test Suite
on: on:
schedule: schedule:
- cron: '0 */6 * * *' - cron: '0 */6 * * *'
pull_request:
push: push:
tags: tags:
- v* - v*
@ -46,11 +47,12 @@ jobs:
fi fi
- name: run test cases - name: run test cases
run: | run: |
export CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_
printenv > .env
docker exec -i erlang sh -c "make ensure-rebar3" docker exec -i erlang sh -c "make ensure-rebar3"
docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_ldap" printenv | grep "^EMQX_" > .env
docker exec --env-file .env -i erlang sh -c "./rebar3 ct --dir apps/emqx_auth_ldap" docker exec -i \
-e "CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_" \
--env-file .env \
erlang sh -c "make apps/emqx_auth_ldap-ct"
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v1
if: failure() if: failure()
with: with:
@ -115,11 +117,11 @@ jobs:
fi fi
- name: run test cases - name: run test cases
run: | run: |
export CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_ printenv | grep "^EMQX_" > .env
printenv > .env docker exec -i \
docker exec -i erlang sh -c "make ensure-rebar3" -e "CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_" \
docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_mongo" --env-file .env \
docker exec --env-file .env -i erlang sh -c "./rebar3 ct --dir apps/emqx_auth_mongo" erlang sh -c "make apps/emqx_auth_mongo-ct"
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v1
if: failure() if: failure()
with: with:
@ -197,11 +199,11 @@ jobs:
fi fi
- name: run test cases - name: run test cases
run: | run: |
export CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_ printenv | grep "^EMQX_" > .env
printenv > .env docker exec -i \
docker exec -i erlang sh -c "make ensure-rebar3" -e "CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_" \
docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_mysql" --env-file .env \
docker exec --env-file .env -i erlang sh -c "./rebar3 ct --dir apps/emqx_auth_mysql" erlang sh -c "make apps/emqx_auth_mysql-ct"
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v1
if: failure() if: failure()
with: with:
@ -270,12 +272,12 @@ jobs:
run: | run: |
export EMQX_AUTH__PGSQL__USERNAME=root \ export EMQX_AUTH__PGSQL__USERNAME=root \
EMQX_AUTH__PGSQL__PASSWORD=public \ EMQX_AUTH__PGSQL__PASSWORD=public \
EMQX_AUTH__PGSQL__DATABASE=mqtt \ EMQX_AUTH__PGSQL__DATABASE=mqtt
CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_ printenv | grep "^EMQX_" > .env
printenv > .env docker exec -i \
docker exec -i erlang sh -c "make ensure-rebar3" -e "CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_" \
docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_pgsql" --env-file .env \
docker exec --env-file .env -i erlang sh -c "./rebar3 ct --dir apps/emqx_auth_pgsql" erlang sh -c "make apps/emqx_auth_pgsql-ct"
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v1
if: failure() if: failure()
with: with:
@ -391,12 +393,12 @@ jobs:
fi fi
- name: run test cases - name: run test cases
run: | run: |
export CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_
export EMQX_AUTH__REIDS__PASSWORD=public export EMQX_AUTH__REIDS__PASSWORD=public
printenv > .env printenv | grep "^EMQX_" > .env
docker exec -i erlang sh -c "make ensure-rebar3" docker exec -i \
docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_redis" -e "CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_" \
docker exec --env-file .env -i erlang sh -c "./rebar3 ct --dir apps/emqx_auth_redis" --env-file .env \
erlang sh -c "make apps/emqx_auth_redis-ct"
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v1
if: failure() if: failure()
with: with:

2
Makefile
View File

@ -51,7 +51,7 @@ APPS=$(shell $(CURDIR)/scripts/find-apps.sh)
## app/name-ct targets are intended for local tests hence cover is not enabled ## app/name-ct targets are intended for local tests hence cover is not enabled
.PHONY: $(APPS:%=%-ct) .PHONY: $(APPS:%=%-ct)
define gen-app-ct-target 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) $(REBAR) ct --name 'test@127.0.0.1' -v --suite $(shell $(CURDIR)/scripts/find-suites.sh $1)
endef endef
$(foreach app,$(APPS),$(eval $(call gen-app-ct-target,$(app)))) $(foreach app,$(APPS),$(eval $(call gen-app-ct-target,$(app))))