diff --git a/Makefile b/Makefile index b1da0870d..356f9dbe1 100644 --- a/Makefile +++ b/Makefile @@ -490,7 +490,7 @@ test-verif-proxy-wrapper: #run-integration-tests: SHELL := /bin/sh # Run not in nix-shell, we need codecov run-integration-tests: export INTEGRATION_TESTS_DOCKER_UID ?= $(call sh, id -u $$USER) -run-integration-tests: export INTEGRATION_TESTS_REPORT_CODECOV = false +run-integration-tests: export INTEGRATION_TESTS_REPORT_CODECOV ?= false run-integration-tests: @./_assets/scripts/run_integration_tests.sh diff --git a/_assets/scripts/run_integration_tests.sh b/_assets/scripts/run_integration_tests.sh index 75d1db8fc..86311330c 100755 --- a/_assets/scripts/run_integration_tests.sh +++ b/_assets/scripts/run_integration_tests.sh @@ -4,8 +4,6 @@ GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel) source "${GIT_ROOT}/_assets/scripts/colors.sh" source "${GIT_ROOT}/_assets/scripts/codecov.sh" -echo -e "${GRN}Running integration tests${RST}, HEAD: $(git rev-parse HEAD)" - root_path=./integration-tests coverage_reports_path="${root_path}/coverage" @@ -13,12 +11,14 @@ coverage_reports_path="${root_path}/coverage" rm -rf ${coverage_reports_path} # Run integration tests +echo -e "${GRN}Running integration tests${RST}, HEAD: $(git rev-parse HEAD)" docker-compose \ -f ${root_path}/docker-compose.anvil.yml \ -f ${root_path}/docker-compose.test.status-go.yml \ up -d --build --remove-orphans; # Save logs +echo -e "${GRN}Saving logs${RST}" docker-compose \ -f ${root_path}/docker-compose.anvil.yml \ -f ${root_path}/docker-compose.test.status-go.yml \ @@ -28,6 +28,7 @@ docker-compose \ exit_code=$(docker inspect integration-tests_tests-rpc_1 -f '{{.State.ExitCode}}'); # Stop and remove containers +echo -e "${GRN}Stopping docker containers${RST}" docker-compose \ -f ${root_path}/docker-compose.anvil.yml \ -f ${root_path}/docker-compose.test.status-go.yml \