Merge pull request #60872 from krzyzacy/fix-kubemark

Automatic merge from submit-queue (batch tested with PRs 60872, 60808). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. purge all the -v references from e2e.go cf for https://github.com/kubernetes/kubernetes/issues/60870 probably need to work together with https://github.com/kubernetes/test-infra/pull/7164

Merge pull request #60872 from krzyzacy/fix-kubemark
21467498 · Kubernetes Submit Queue · GitHub · f196b7c7 · b01d2ba0 · 21467498
Unverified Commit 21467498 authored Mar 07, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 07, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Makefile build/root/Makefile +1 -1

run-e2e-tests.sh test/kubemark/run-e2e-tests.sh +1 -1

No files found.
--- a/build/root/Makefile
+++ b/build/root/Makefile
@@ -215,7 +215,7 @@ test-e2e:
 	@echo "$$TEST_E2E_HELP_INFO"
 else
 test-e2e: ginkgo generated_files
-	go run hack/e2e.go -- -v --build --up --test --down
+	go run hack/e2e.go -- --build --up --test --down
 endif

 define TEST_E2E_NODE_HELP_INFO

--- a/test/kubemark/run-e2e-tests.sh
+++ b/test/kubemark/run-e2e-tests.sh
@@ -44,7 +44,7 @@ fi

 if [[ -f /.dockerenv ]]; then
 	# Running inside a dockerized runner.
-	go run ./hack/e2e.go -- -v --check-version-skew=false --test --test_args="--e2e-verify-service-account=false --dump-logs-on-failure=false ${ARGS}"
+	go run ./hack/e2e.go -- --check-version-skew=false --test --test_args="--e2e-verify-service-account=false --dump-logs-on-failure=false ${ARGS}"
 else
 	# Running locally.
 	ARGS=$(echo $ARGS | sed 's/\[/\\\[/g' | sed 's/\]/\\\]/g')