istio
/
istio.io
mirror of https://github.com/istio/istio.io.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use template for sub testcases, fix TAG for them (#7237)

This commit is contained in:
Eric Van Norman 2020-05-07 19:37:29 -05:00 committed by GitHub
parent f58fffb5d1
commit 0c196ee512
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.core.mk
View File

@ -153,13 +153,12 @@ init: preinit
ifndef TAG ifndef TAG
$(eval TAG := ${ISTIO_IMAGE_VERSION}.${ISTIO_LONG_SHA}) $(eval TAG := ${ISTIO_IMAGE_VERSION}.${ISTIO_LONG_SHA})
endif endif
@echo "TAG=${TAG}"
# If a variant is defined, update the tag accordingly # If a variant is defined, update the tag accordingly
ifdef VARIANT ifdef VARIANT
$(eval TAG=${TAG}-${VARIANT}) $(eval TAG=${TAG}-${VARIANT})
endif endif
@export TAG @export TAG
@echo "final TAG=${TAG}" @echo "TAG=${TAG}"
include tests/tests.mk include tests/tests.mk

25
tests/tests.mk
View File

@ -41,30 +41,11 @@ test.kube.presubmit: init | $(JUNIT_REPORT)
test.kube.postsubmit: test.kube.presubmit test.kube.postsubmit: test.kube.presubmit
SNIPPETS_GCS_PATH="istio-snippets/$(shell git rev-parse HEAD)" prow/upload-istioio-snippets.sh SNIPPETS_GCS_PATH="istio-snippets/$(shell git rev-parse HEAD)" prow/upload-istioio-snippets.sh
test.kube.configuration: init | $(JUNIT_REPORT) test.kube.%: init | $(JUNIT_REPORT)
PATH=${PATH}:${ISTIO_OUT} $(GO) test -p 1 ${T} ./tests/configuration/... -timeout 30m \ $(eval INTEGRATION_TEST_FLAGS += --istio.test.tag=$(TAG))
PATH=${PATH}:${ISTIO_OUT} $(GO) test -p 1 ${T} ./tests/$(subst .,/,$*)/... -timeout 30m \
--istio.test.select -postsubmit,-flaky \ --istio.test.select -postsubmit,-flaky \
--istio.test.env kube \ --istio.test.env kube \
${_INTEGRATION_TEST_FLAGS} \ ${_INTEGRATION_TEST_FLAGS} \
2>&1 | tee >($(JUNIT_REPORT) > $(JUNIT_OUT)) 2>&1 | tee >($(JUNIT_REPORT) > $(JUNIT_OUT))
test.kube.examples: init | $(JUNIT_REPORT)
PATH=${PATH}:${ISTIO_OUT} $(GO) test -p 1 ${T} ./tests/examples/... -timeout 30m \
--istio.test.select -postsubmit,-flaky \
--istio.test.env kube \
${_INTEGRATION_TEST_FLAGS} \
2>&1 | tee >($(JUNIT_REPORT) > $(JUNIT_OUT))
test.kube.security: init | $(JUNIT_REPORT)
PATH=${PATH}:${ISTIO_OUT} $(GO) test -p 1 ${T} ./tests/security/... -timeout 30m \
--istio.test.select -postsubmit,-flaky \
--istio.test.env kube \
${_INTEGRATION_TEST_FLAGS} \
2>&1 | tee >($(JUNIT_REPORT) > $(JUNIT_OUT))
test.kube.trafficmanagement: init | $(JUNIT_REPORT)
PATH=${PATH}:${ISTIO_OUT} $(GO) test -p 1 ${T} ./tests/trafficmanagement/... -timeout 30m \
--istio.test.select -postsubmit,-flaky \
--istio.test.env kube \
${_INTEGRATION_TEST_FLAGS} \
2>&1 | tee >($(JUNIT_REPORT) > $(JUNIT_OUT))