contrib/mesos/ci: clone conformance branch into subdir

In order to properly shutdown the docker-compose cluster, after the conformance test it is necessary to have the original version again. Running the conformance tests from a clone in subdir with the right branch given by CONFORMANCE_BRANCH is much easier.

contrib/mesos/ci: clone conformance branch into subdir
2302caf9 · Dr. Stefan Schimanski · ede8de7a · 2302caf9
Commit 2302caf9 authored Nov 27, 2015 by Dr. Stefan Schimanski
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 12 deletions

test-conformance.sh contrib/mesos/ci/test-conformance.sh +6 -12

No files found.
--- a/contrib/mesos/ci/test-conformance.sh
+++ b/contrib/mesos/ci/test-conformance.sh
@@ -31,19 +31,13 @@ TEST_ARGS="$@"

 KUBE_ROOT=$(cd "$(dirname "${BASH_SOURCE}")/../../.." && pwd)

+TEST_CMD="KUBECONFIG=~/.kube/config hack/conformance-test.sh"
 if [ -n "${CONFORMANCE_BRANCH}" ]; then
-	# checkout CONFORMANCE_BRANCH, but leave the contrib/mesos/ci directory
-	# untouched.
+	# create a CONFORMANCE_BRANCH clone in a subdirectory
 	TEST_CMD="
-git fetch https://github.com/kubernetes/kubernetes ${CONFORMANCE_BRANCH} &&
-git checkout FETCH_HEAD -- . ':(exclude)contrib/mesos/ci/**' &&
-git reset FETCH_HEAD &&
-git clean -d -f -- . ':(exclude)contrib/mesos/ci/**' &&
-git status &&
-make all &&
-"
-else
-	TEST_CMD=""
+git fetch https://github.com/kubernetes/kubernetes --tags -q ${CONFORMANCE_BRANCH} &&
+git clone -s -b ${CONFORMANCE_BRANCH} . conformance &&
+cd conformance && make all && ${TEST_CMD}"
 fi
-TEST_CMD+="KUBECONFIG=~/.kube/config hack/conformance-test.sh"
+
 "${KUBE_ROOT}/contrib/mesos/ci/run-with-cluster.sh" ${TEST_CMD} ${TEST_ARGS}