mirror of https://github.com/k3s-io/k3s
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
parent
ede8de7aba
commit
2302caf970
|
@ -31,19 +31,13 @@ TEST_ARGS="$@"
|
||||||
|
|
||||||
KUBE_ROOT=$(cd "$(dirname "${BASH_SOURCE}")/../../.." && pwd)
|
KUBE_ROOT=$(cd "$(dirname "${BASH_SOURCE}")/../../.." && pwd)
|
||||||
|
|
||||||
|
TEST_CMD="KUBECONFIG=~/.kube/config hack/conformance-test.sh"
|
||||||
if [ -n "${CONFORMANCE_BRANCH}" ]; then
|
if [ -n "${CONFORMANCE_BRANCH}" ]; then
|
||||||
# checkout CONFORMANCE_BRANCH, but leave the contrib/mesos/ci directory
|
# create a CONFORMANCE_BRANCH clone in a subdirectory
|
||||||
# untouched.
|
|
||||||
TEST_CMD="
|
TEST_CMD="
|
||||||
git fetch https://github.com/kubernetes/kubernetes ${CONFORMANCE_BRANCH} &&
|
git fetch https://github.com/kubernetes/kubernetes --tags -q ${CONFORMANCE_BRANCH} &&
|
||||||
git checkout FETCH_HEAD -- . ':(exclude)contrib/mesos/ci/**' &&
|
git clone -s -b ${CONFORMANCE_BRANCH} . conformance &&
|
||||||
git reset FETCH_HEAD &&
|
cd conformance && make all && ${TEST_CMD}"
|
||||||
git clean -d -f -- . ':(exclude)contrib/mesos/ci/**' &&
|
|
||||||
git status &&
|
|
||||||
make all &&
|
|
||||||
"
|
|
||||||
else
|
|
||||||
TEST_CMD=""
|
|
||||||
fi
|
fi
|
||||||
TEST_CMD+="KUBECONFIG=~/.kube/config hack/conformance-test.sh"
|
|
||||||
"${KUBE_ROOT}/contrib/mesos/ci/run-with-cluster.sh" ${TEST_CMD} ${TEST_ARGS}
|
"${KUBE_ROOT}/contrib/mesos/ci/run-with-cluster.sh" ${TEST_CMD} ${TEST_ARGS}
|
||||||
|
|
Loading…
Reference in New Issue