Enable Go e2e report_dir in Jenkins

Use the E2E_REPORT_DIR global environment variable to define the
location where the JUnit XML reports should be saved.

Modify the Jenkins e2e.sh script to export that variable pointing to the
top of the Jenkins build tree.

Tested by running `E2E_REPORT_DIR=${PWD}/.. hack/e2e-test.sh` and
confirmed ../junit.xml was generated and looked good.
pull/6/head
Filipe Brandenburger 2015-01-28 14:54:08 -08:00
parent bd79d00e22
commit 606b517a07
2 changed files with 7 additions and 1 deletions

View File

@ -82,4 +82,7 @@ else
auth_config=() auth_config=()
fi 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-) export CLUSTER_API_VERSION=$(echo ${GITHASH} | cut -c 2-)
fi 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 --down
go run ./hack/e2e.go ${E2E_OPT} -v --up 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 -v --ctl="version --match-server-version=false"