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

Revert jenkins/e2e.sh back to 606b517a, minus -tap #4173

Merged
merged 1 commit into from
Feb 5, 2015
Merged

Revert jenkins/e2e.sh back to 606b517a, minus -tap #4173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions hack/jenkins/e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,11 @@ if [[ ! -z ${E2E_SET_CLUSTER_API_VERSION:-} ]]; then
export CLUSTER_API_VERSION=$(echo ${GITHASH} | cut -c 2-)
fi

export KUBE_CONFIG_FILE="config-test.sh"
cluster/kube-down.sh || true
cluster/kube-up.sh || { echo "-- kube-up failed --"; exit 1; }
echo
echo "-- cluster created at $(date -Is) --"
echo
cluster/kubectl.sh version || { echo "-- kubectl failed --"; exit 1; }
hack/ginkgo-e2e.sh --report_dir=${WORKSPACE} || { echo "-- tests failed --"; exit 1; }
cluster/kube-down.sh || { echo "-- kube-down failed --"; exit 1; }
# Have cmd/e2e run by goe2e.sh generate JUnit report in ${WORKSPACE}/junit*.xml
export E2E_REPORT_DIR=${WORKSPACE}

go run ./hack/e2e.go ${E2E_OPT} -v --down
go run ./hack/e2e.go ${E2E_OPT} -v --up
go run ./hack/e2e.go -v --ctl="version --match-server-version=false"
go run ./hack/e2e.go ${E2E_OPT} -v --test
go run ./hack/e2e.go ${E2E_OPT} -v --down