From 76e25eea42c9e49224471ceacfa144b6b891b4d8 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Mon, 25 Sep 2017 10:27:20 -0400
Subject: [PATCH] integration: jUnit output from e2e

Processing node-e2e.log into jUnit format is insane, it's chock-full of
terminal escape codes.  They would either need to be scraped/removed or
disabled somehow.  Instead, take advantage of ``e2e.go --report-dir=``
option.  This will cause it to store native jUnit results in the
specified directory for later collection.  The jUnit results are also
needed for the google test grid.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 contrib/test/integration/e2e.yml | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/contrib/test/integration/e2e.yml b/contrib/test/integration/e2e.yml
index a8ee1f22..90080024 100644
--- a/contrib/test/integration/e2e.yml
+++ b/contrib/test/integration/e2e.yml
@@ -31,13 +31,24 @@
   retries: 100
   delay: 30
 
+- name: Buffer location for e2e output and reports
+  set_fact:
+      # N/B: This need manual coordination with results.yml
+      artifacts: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/artifacts"
+
 - name: ensure directory exists for e2e reports
   file:
-    path: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/artifacts"
+    path: "{{ artifacts }}"
     state: directory
 
 - name: run e2e tests
-  shell: |
-    go run hack/e2e.go -v --test -test_args="-host=https://{{ ansible_default_ipv4.address }}:6443 --ginkgo.focus=\[Conformance\]" >e2e.log 2>&1
+  shell: >
+    go run hack/e2e.go \
+        --test \
+        -test_args="-host=https://{{ ansible_default_ipv4.address }}:6443 \
+                    --ginkgo.focus=\[Conformance\] \
+                    --report-dir={{ artifacts }}" \
+        &> {{ artifacts }}/e2e.log
+  # Fix " syntax hilighting
   args:
-    chdir: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes"
\ No newline at end of file
+    chdir: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes"