diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ca65d6ca..09c19e64 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -76,4 +76,4 @@ jobs: vars_json: ${{ toJSON(vars) }} - name: Run e2e tests - run: make test-e2e ARGS="-v -run ${E2E_REGEX}" + run: make test-e2e ARGS="-v" diff --git a/Makefile b/Makefile index 20e13157..bcabe780 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ test-integration: .bin-image docker run -t --rm -e PACKAGER=$(PACKAGER) $(BB_RPC_ENV) -v "$(CURDIR):/src" --network="host" $(BIN_IMAGE) make test-integration ARGS="$(ARGS)" test-e2e: .bin-image - docker run -t --rm -e PACKAGER=$(PACKAGER) $(BB_RPC_ENV) -v "$(CURDIR):/src" --network="host" $(BIN_IMAGE) make test-e2e ARGS="$(ARGS)" + docker run -t --rm -e PACKAGER=$(PACKAGER) -e E2E_REGEX $(BB_RPC_ENV) -v "$(CURDIR):/src" --network="host" $(BIN_IMAGE) make test-e2e ARGS="$(ARGS)" test-connectivity: .bin-image docker run -t --rm -e PACKAGER=$(PACKAGER) $(BB_RPC_ENV) -v "$(CURDIR):/src" --network="host" $(BIN_IMAGE) make test-connectivity ARGS="$(ARGS)" diff --git a/build/docker/bin/Makefile b/build/docker/bin/Makefile index 02f86053..7fba83f8 100644 --- a/build/docker/bin/Makefile +++ b/build/docker/bin/Makefile @@ -30,7 +30,7 @@ test-integration: prepare-sources cd $(BLOCKBOOK_SRC) && go test -tags 'integration' `go list github.com/trezor/blockbook/tests/...` -run 'TestIntegration/.*/(rpc|sync)' -timeout 30m $(ARGS) test-e2e: prepare-sources - cd $(BLOCKBOOK_SRC) && go test -tags 'integration' `go list github.com/trezor/blockbook/tests/...` -run 'TestIntegration/.*/api' -timeout 30m $(ARGS) + cd $(BLOCKBOOK_SRC) && go test -tags 'integration' `go list github.com/trezor/blockbook/tests/...` -run "$${E2E_REGEX:-TestIntegration/.*/api}" -timeout 30m $(ARGS) test-connectivity: prepare-sources cd $(BLOCKBOOK_SRC) && go test -tags 'integration' github.com/trezor/blockbook/tests -run 'TestIntegration/.*/connectivity' -timeout 30m $(ARGS)