kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

ci: make split between e2e and integration tests explicit (#9091)

Browse Source 
Currently we compile (but don't run) the e2e tests as part of `test-other`,
which is skipped for branches named `e2e-*`. Move this check into the
`test-e2e` job. Split out the vault compatibility integration check as its own
makefile target for clarity.
This commit is contained in:
Tim Gross
2020-10-14 14:53:21 -04:00
committed by GitHub
parent d68e3d4218
commit b2fb40ec71
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml generated
View File

@@ -807,7 +807,7 @@ jobs:
- PAGER: cat
- GOTEST_MOD: ''
- GOTEST_PKGS: ''
- GOTEST_PKGS_EXCLUDE: ./api|./client|./drivers/docker|./drivers/exec|./drivers/shared/executor|./nomad|./devices
- GOTEST_PKGS_EXCLUDE: ./api|./client|./drivers/docker|./drivers/exec|./drivers/shared/executor|./nomad|./devices|./e2e
- GOTESTARCH: amd64
steps:
- checkout
@@ -1234,6 +1234,8 @@ jobs:
name: prepare non-root user
- run:
command: sudo -E -H -u circleci PATH=${PATH} make deps
- run:
command: sudo -E -H -u circleci PATH=${PATH} make integration-test
- run:
command: sudo -E -H -u circleci PATH=${PATH} make e2e-test
environment:

1
.circleci/config/jobs/test-e2e.yml
View File

@@ -14,4 +14,5 @@ steps:
chown -R circleci:circleci /go
- run: sudo -E -H -u circleci PATH=${PATH} make deps
- run: sudo -E -H -u circleci PATH=${PATH} make integration-test
- run: sudo -E -H -u circleci PATH=${PATH} make e2e-test

2
.circleci/config/workflows/build-test.yml
View File

@@ -69,7 +69,7 @@ jobs:
filters: *backend_test_branches_filter
- test-machine:
name: "test-other"
exclude_packages: "./api|./client|./drivers/docker|./drivers/exec|./drivers/shared/executor|./nomad|./devices"
exclude_packages: "./api|./client|./drivers/docker|./drivers/exec|./drivers/shared/executor|./nomad|./devices|./e2e"
filters: *backend_test_branches_filter
- test-machine:
name: "test-docker"

9
GNUmakefile
View File

@@ -351,6 +351,15 @@ test-nomad-module: dev ## Run Nomad test suites on a sub-module
.PHONY: e2e-test
e2e-test: dev ## Run the Nomad e2e test suite
@echo "==> Running Nomad E2E test suites:"
go test \
$(if $(ENABLE_RACE),-race) $(if $(VERBOSE),-v) \
-timeout=900s \
-tags "$(GO_TAGS)" \
github.com/hashicorp/nomad/e2e
.PHONY: integration-test
integration-test: dev ## Run Nomad integration tests
@echo "==> Running Nomad integration test suites:"
go test \
$(if $(ENABLE_RACE),-race) $(if $(VERBOSE),-v) \
-cover \