From 606b517a071b29d5de3e99c4f044946937190443 Mon Sep 17 00:00:00 2001
From: Filipe Brandenburger <filbranden@google.com>
Date: Wed, 28 Jan 2015 14:54:08 -0800
Subject: [PATCH] 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.
---
 hack/e2e-suite/goe2e.sh | 5 ++++-
 hack/jenkins/e2e.sh     | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/hack/e2e-suite/goe2e.sh b/hack/e2e-suite/goe2e.sh
index b9dae0c4e5..dd7b9500fb 100755
--- a/hack/e2e-suite/goe2e.sh
+++ b/hack/e2e-suite/goe2e.sh
@@ -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}"}
diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index 296e7a401d..25e8d50362 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -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"