Skip to content
Snippets Groups Projects
Commit 1bac8725 authored by Konrad Mohrfeldt's avatar Konrad Mohrfeldt :koala:
Browse files

fix(ci): just use test-local make target in CI

parent 970dee89
No related branches found
No related tags found
No related merge requests found
...@@ -163,7 +163,7 @@ test: ...@@ -163,7 +163,7 @@ test:
- wait-for-it -h steering -p "$STEERING_PORT" - wait-for-it -h steering -p "$STEERING_PORT"
- wait-for-it -h tank -p "$TANK_PORT" - wait-for-it -h tank -p "$TANK_PORT"
script: script:
- make test - make test-local
artifacts: artifacts:
when: on_failure when: on_failure
expire_in: 30 days expire_in: 30 days
......
...@@ -137,14 +137,10 @@ test-local: $(DIR_DIST) ...@@ -137,14 +137,10 @@ test-local: $(DIR_DIST)
.ONESHELL: .ONESHELL:
test: test:
. tests/env . tests/env
if [ "$(CI)" = true ]; then \ $(DOCKER_COMPOSE) \
$(MAKE) test-local; \ --env-file tests/env \
else \ --file tests/docker-compose.yml \
$(DOCKER_COMPOSE) \ up \
--env-file tests/env \ --force-recreate \
--file tests/docker-compose.yml \ --exit-code-from dashboard-test \
up \ ;
--force-recreate \
--exit-code-from dashboard-test \
; \
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment