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

Merge pull request #17869 from mesosphere/sttts-conformance-clone 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-11-27 07:26:06 -08:00
parent fc927e8719 2302caf970
commit 505d12a9ac
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/mesos/ci/run-with-cluster.sh
View File

@ -81,6 +81,6 @@ exec docker run \
trap 'timeout 5m ./cluster/kube-down.sh' EXIT && \
./cluster/kube-down.sh && \
./cluster/kube-up.sh && \
trap 'test \$? != 0 && export MESOS_DOCKER_DUMP_LOGS=true; timeout 5m ./cluster/kube-down.sh' EXIT && \
trap \"test \\\$? != 0 && export MESOS_DOCKER_DUMP_LOGS=true; cd \${PWD} && timeout 5m ./cluster/kube-down.sh\" EXIT && \
${RUN_CMD}
"

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}