From 168394c6d52ea90e55b11183fff1b6e02df94ef6 Mon Sep 17 00:00:00 2001
From: Joseph Lanoux <joseph.lanoux@hpe.com>
Date: Thu, 9 Mar 2017 11:24:19 +0000
Subject: [PATCH 1/2] Fix the ginkgo nocolor parameter

When running the e2e tests in parallel, the ginkgo nocolor is not
honored and produces a colored output. This change adds the
GINKGO_NO_COLOR environment variable.
---
 hack/ginkgo-e2e.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hack/ginkgo-e2e.sh b/hack/ginkgo-e2e.sh
index 8c000606772..6d180853775 100755
--- a/hack/ginkgo-e2e.sh
+++ b/hack/ginkgo-e2e.sh
@@ -113,6 +113,10 @@ if [[ "${GINKGO_TOLERATE_FLAKES}" == "y" ]]; then
   FLAKE_ATTEMPTS=2
 fi
 
+if [[ "${GINKGO_NO_COLOR}" == "y" ]]; then
+  ginkgo_args+=("--noColor")
+fi
+
 # The --host setting is used only when providing --auth_config
 # If --kubeconfig is used, the host to use is retrieved from the .kubeconfig
 # file and the one provided with --host is ignored.

From b2560666fa4b91fdee586a36804810c4097ea721 Mon Sep 17 00:00:00 2001
From: joseph-lanoux <joseph.lanoux@hpe.com>
Date: Thu, 23 Mar 2017 08:59:49 +0000
Subject: [PATCH 2/2] Update ginkgo-e2e.sh

---
 hack/ginkgo-e2e.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hack/ginkgo-e2e.sh b/hack/ginkgo-e2e.sh
index 6d180853775..7c063dfda5a 100755
--- a/hack/ginkgo-e2e.sh
+++ b/hack/ginkgo-e2e.sh
@@ -30,6 +30,10 @@ e2e_test=$(kube::util::find-binary "e2e.test")
 
 GINKGO_PARALLEL=${GINKGO_PARALLEL:-n} # set to 'y' to run tests in parallel
 
+# If 'y', Ginkgo's reporter will not print out in color when tests are run
+# in parallel
+GINKGO_NO_COLOR=${GINKGO_NO_COLOR:-n}
+
 # If 'y', will rerun failed tests once to give them a second chance.
 GINKGO_TOLERATE_FLAKES=${GINKGO_TOLERATE_FLAKES:-n}