Merge pull request #3855 from filbranden/ginkgo1

Initial adoption of Ginkgo in Kubernetes e2e tests
This commit is contained in:
Zach Loafman
2015-01-28 16:32:11 -08:00
250 changed files with 25469 additions and 112 deletions

View File

@@ -82,4 +82,7 @@ else
auth_config=()
fi
"${e2e}" "${auth_config[@]:+${auth_config[@]}}" --host="https://${KUBE_MASTER_IP-}" --provider="${KUBERNETES_PROVIDER}"
"${e2e}" "${auth_config[@]:+${auth_config[@]}}" \
--host="https://${KUBE_MASTER_IP-}" \
--provider="${KUBERNETES_PROVIDER}" \
${E2E_REPORT_DIR+"--report_dir=${E2E_REPORT_DIR}"}

View File

@@ -77,6 +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"