Portability of make e2e_all on mac (istio#4443)

Automatic merge from submit-queue. Portability of make e2e_all on mac Once this PR is in, please merge this one istio-releases/daily-release#479
zqzstar · Mar 23, 2018 · 3255c73 · 3255c73
1 parent 10fcf48
commit 3255c73
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/prow/e2e-suite.sh b/prow/e2e-suite.sh
@@ -107,5 +107,5 @@ else
     time ISTIO_DOCKER_HUB=$HUB \
       E2E_ARGS="${E2E_ARGS[@]}" \
       JUNIT_E2E_XML="${ARTIFACTS_DIR}/junit_e2e-all.xml" \
-      make e2e_all
+      make e2e_all_junit_report
 fi
diff --git a/tests/istio.mk b/tests/istio.mk
@@ -89,12 +89,13 @@ e2e_upgrade: istioctl generate_yaml
 e2e_version_skew: istioctl generate_yaml
 	go test -v -timeout 20m ./tests/e2e/tests/upgrade -args --smooth_check=true ${E2E_ARGS} ${EXTRA_E2E_ARGS} ${UPGRADE_E2E_ARGS}
 
+e2e_all:
+	$(MAKE) --keep-going e2e_simple e2e_mixer e2e_bookinfo e2e_dashboard e2e_upgrade
+
 JUNIT_E2E_XML ?= $(ISTIO_OUT)/junit_e2e-all.xml
-e2e_all: | $(JUNIT_REPORT)
+e2e_all_junit_report: | $(JUNIT_REPORT)
 	mkdir -p $(dir $(JUNIT_E2E_XML))
-	set -o pipefail; \
-	$(MAKE) --keep-going e2e_simple e2e_mixer e2e_bookinfo e2e_dashboard e2e_upgrade \
-	|& tee >($(JUNIT_REPORT) > $(JUNIT_E2E_XML))
+	set -o pipefail; $(MAKE) e2e_all 2>&1 | tee >($(JUNIT_REPORT) > $(JUNIT_E2E_XML))
 
 # Run the e2e tests, with auth enabled. A separate target is used for non-auth.
 e2e_pilot: istioctl generate_yaml