From 2eccd87ccbd987199ea0c2d5a2e35905dca7fae0 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Fri, 29 May 2015 13:25:17 -0700 Subject: [PATCH] Adjust the Jenkins E2E_REPORT_DIR to something less silly Start of a fix for complaints on #8852. --- hack/jenkins/e2e.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index f642a328cc..ad9367cf79 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -204,7 +204,9 @@ fi cd kubernetes # Have cmd/e2e run by goe2e.sh generate JUnit report in ${WORKSPACE}/junit*.xml -export E2E_REPORT_DIR=${WORKSPACE} +ARTIFACTS=${WORKSPACE}/_artifacts +mkdir -p ${ARTIFACTS} +export E2E_REPORT_DIR=${ARTIFACTS} ### Set up ### if [[ "${E2E_UP,,}" == "true" ]]; then @@ -220,6 +222,13 @@ if [[ "${E2E_TEST,,}" == "true" ]]; then go run ./hack/e2e.go ${E2E_OPT} -v --test --test_args="${GINKGO_TEST_ARGS}--ginkgo.noColor" || true fi +# TODO(zml): We have a bunch of legacy Jenkins configs that are +# expecting junit*.xml to be in ${WORKSPACE} root and it's Friday +# afternoon, so just put the junit report where it's expected. +for junit in ${ARTIFACTS}/junit*.xml; do + ln -s ${junit} ${WORKSPACE} +done + ### Clean up ### if [[ "${E2E_DOWN,,}" == "true" ]]; then # Sleep before deleting the cluster to give the controller manager time to