Run shell tests under Ginkgo, changing all reporting to JUnit

* Add a test/e2e/shell.go that slurps up everything in hack/e2e-suite
and runs it as a bash test, borrowing all the code from hack/e2e.go.

* Rip out all the crap in hack/e2e.go that deal with multiple tests

* Move hack/e2e-suite/goe2e.sh to hack/ginkgo-e2e.sh so that it
doesn't get slurped up.
This commit is contained in:
Zach Loafman
2015-02-04 16:57:53 -08:00
parent bb6b332a8b
commit 688f96cd33
4 changed files with 83 additions and 160 deletions

View File

@@ -77,11 +77,9 @@ if [[ ! -z ${E2E_SET_CLUSTER_API_VERSION:-} ]]; then
export CLUSTER_API_VERSION=$(echo ${GITHASH} | cut -c 2-)
fi
# 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} --test --tap | tee ../e2e.${JOB_NAME}.${BUILD_NUMBER}.${GITHASH}.tap
go run ./hack/e2e.go ${E2E_OPT} -v --down
export KUBE_CONFIG_FILE="config-test.sh"
cluster/kube-down.sh
cluster/kube-up.sh
cluster/kubectl.sh version
hack/ginkgo-e2e.sh --report_dir=${WORKSPACE}
cluster/kube-down.sh