github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
pull/6/head
Dr. Stefan Schimanski 2015-11-27 11:20:38 +01:00
parent ede8de7aba
commit 2302caf970
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/mesos/ci/test-conformance.sh
View File

@ -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}