Browse Source

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

Fix `make build-integration-cli-on-swarm`
Daniel Nephin 8 years ago
parent
commit
07227a1227
2 changed files with 12 additions and 0 deletions
  1. 4 0
      hack/make/.integration-test-helpers
  2. 8 0
      hack/make/build-integration-test-binary

+ 4 - 0
hack/make/.integration-test-helpers

@@ -33,6 +33,10 @@ run_test_integration() {
 }
 
 build_test_suite_binaries() {
+	if [ $DOCKER_INTEGRATION_TESTS_VERIFIED ]; then
+		echo "Skipping building test binaries; as DOCKER_INTEGRATION_TESTS_VERIFIED is set"
+		return
+	fi
 	build_test_suite_binary ./integration-cli "test.main"
 	for dir in $integration_api_dirs; do
 		build_test_suite_binary "$dir" "test.main"

+ 8 - 0
hack/make/build-integration-test-binary

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# required by `make build-integration-cli-on-swarm`
+set -e
+
+source "${MAKEDIR}/.go-autogen"
+source hack/make/.integration-test-helpers
+
+build_test_suite_binaries