diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dd6a50d830..76de25c0bb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -113,7 +113,7 @@ jobs: - name: Test E2E if: env.GIT_DIFF run: | - EXPERIMENTAL=true make test-e2e + make test-e2e liveness-test: needs: install-tparse diff --git a/Makefile b/Makefile index 940215f5f0..d48431097f 100644 --- a/Makefile +++ b/Makefile @@ -169,9 +169,6 @@ go.sum: go.mod ############################################################################### docker-build-e2e: - @DOCKER_BUILDKIT=1 docker build -t umee-network/umeed-e2e -f contrib/images/umee.e2e.dockerfile . - -docker-build-e2e-experimental: @DOCKER_BUILDKIT=1 docker build -t umee-network/umeed-e2e -f contrib/images/umee.e2e.dockerfile --build-arg EXPERIMENTAL=true . docker-build: @@ -196,14 +193,12 @@ TEST_COVERAGE_PROFILE=coverage.txt UNIT_TEST_TAGS = norace TEST_RACE_TAGS = "" -TEST_E2E_TAGS = "e2e" +TEST_E2E_TAGS = "e2e experimental" TEST_E2E_DEPS = docker-build-e2e ifeq ($(EXPERIMENTAL),true) UNIT_TEST_TAGS += experimental TEST_RACE_TAGS += experimental - TEST_E2E_TAGS += experimental - TEST_E2E_DEPS = docker-build-e2e-experimental endif test-unit: ARGS=-timeout=10m -tags='$(UNIT_TEST_TAGS)'