Browse code

Merge pull request #34492 from AkihiroSuda/fix-integration-cli-on-swarm

Fix `make build-integration-cli-on-swarm`

Daniel Nephin authored on 2017/08/15 01:20:18
Showing 2 changed files
... ...
@@ -33,6 +33,10 @@ run_test_integration() {
33 33
 }
34 34
 
35 35
 build_test_suite_binaries() {
36
+	if [ $DOCKER_INTEGRATION_TESTS_VERIFIED ]; then
37
+		echo "Skipping building test binaries; as DOCKER_INTEGRATION_TESTS_VERIFIED is set"
38
+		return
39
+	fi
36 40
 	build_test_suite_binary ./integration-cli "test.main"
37 41
 	for dir in $integration_api_dirs; do
38 42
 		build_test_suite_binary "$dir" "test.main"
39 43
new file mode 100755
... ...
@@ -0,0 +1,8 @@
0
+#!/usr/bin/env bash
1
+# required by `make build-integration-cli-on-swarm`
2
+set -e
3
+
4
+source "${MAKEDIR}/.go-autogen"
5
+source hack/make/.integration-test-helpers
6
+
7
+build_test_suite_binaries