Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MESOS/CI: clone conformance branch into subdir #17869

Merged
merged 2 commits into from
Nov 27, 2015
Merged

MESOS/CI: clone conformance branch into subdir #17869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ede8de7
contrib/mesos/ci: call kube-down.sh from correct dir
sttts Nov 27, 2015
2302caf
contrib/mesos/ci: clone conformance branch into subdir
sttts Nov 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/mesos/ci/run-with-cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 6 additions & 12 deletions contrib/mesos/ci/test-conformance.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}