From 5e6d35897dbc6f434e4cc3f502481b484ea329b7 Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <stefan.schimanski@gmail.com>
Date: Thu, 26 Nov 2015 14:37:01 +0100
Subject: [PATCH] contrib/mesos/ci: add CONFORMANCE_BRANCH override

---
 contrib/mesos/ci/test-conformance.sh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/contrib/mesos/ci/test-conformance.sh b/contrib/mesos/ci/test-conformance.sh
index 49d8f509a39..2e67bbf59dc 100755
--- a/contrib/mesos/ci/test-conformance.sh
+++ b/contrib/mesos/ci/test-conformance.sh
@@ -31,4 +31,19 @@ TEST_ARGS="$@"
 
 KUBE_ROOT=$(cd "$(dirname "${BASH_SOURCE}")/../../.." && pwd)
 
-"${KUBE_ROOT}/contrib/mesos/ci/run-with-cluster.sh" KUBECONFIG=~/.kube/config hack/conformance-test.sh ${TEST_ARGS}
+if [ -n "${CONFORMANCE_BRANCH}" ]; then
+	# checkout CONFORMANCE_BRANCH, but leave the contrib/mesos/ci directory
+	# untouched.
+	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=""
+fi
+TEST_CMD+="KUBECONFIG=~/.kube/config hack/conformance-test.sh"
+"${KUBE_ROOT}/contrib/mesos/ci/run-with-cluster.sh" ${TEST_CMD} ${TEST_ARGS}