From 4a26114a9a90118f6b72d3cfa3b6ec23bad10270 Mon Sep 17 00:00:00 2001
From: Quinton Hoole <quinton@google.com>
Date: Tue, 7 Jul 2015 18:36:59 -0700
Subject: [PATCH] Make merge conflicts less likely in jenkins/e2e.sh with
 multiline regexs.

---
 hack/jenkins/e2e.sh | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index 3e79dcf572d..0a47a6e7372 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -66,15 +66,45 @@ if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then
 fi
 
 # Specialized tests which should be skipped by default for projects.
-GCE_DEFAULT_SKIP_TEST_REGEX="Skipped|Density|Reboot|Restart|Example"
+GCE_DEFAULT_SKIP_TEST_REGEX="\
+Skipped|\
+Density|\
+Reboot|\
+Restart|\
+Example\
+"
 # The following tests are known to be flaky, and are thus run only in their own
 # -flaky- build variants.
-GCE_FLAKY_TEST_REGEX="Elasticsearch|Shell.*services|MaxPods.*"
+GCE_FLAKY_TEST_REGEX="\
+Elasticsearch\
+|Shell.*services\
+|MaxPods.*\
+"
 # Tests which are not able to be run in parallel.
-GCE_PARALLEL_SKIP_TEST_REGEX="${GCE_DEFAULT_SKIP_TEST_REGEX}|Etcd|NetworkingNew|Nodes\sNetwork|Nodes\sResize|MaxPods"
+GCE_PARALLEL_SKIP_TEST_REGEX="\
+${GCE_DEFAULT_SKIP_TEST_REGEX}\
+|Etcd\
+|NetworkingNew\
+|Nodes\sNetwork\
+|Nodes\sResize\
+|MaxPods\
+"
 # Tests which are known to be flaky when run in parallel.
 # TODO: figure out why GCE_FLAKY_TEST_REGEX is not a perfect subset of this list.
-GCE_PARALLEL_FLAKY_TEST_REGEX="Addon|Elasticsearch|Hostdir.*MOD|Networking.*intra|PD|ServiceAccounts|Service\sendpoints\slatency|Services.*change\sthe\stype|Services.*functioning\sexternal\sload\sbalancer|Services.*identically\snamed|Services.*release.*load\sbalancer|Shell|multiport\sendpoints"
+GCE_PARALLEL_FLAKY_TEST_REGEX="\
+Addon\
+|Elasticsearch\
+|Hostdir.*MOD\
+|Networking.*intra|PD\
+|ServiceAccounts\
+|Service\sendpoints\slatency\
+|Services.*change\sthe\stype\
+|Services.*functioning\sexternal\sload\sbalancer\
+|Services.*identically\snamed\
+|Services.*release.*load\sbalancer\
+|Shell\
+|multiport\sendpoints\
+"
 
 # Define environment variables based on the Jenkins project name.
 case ${JOB_NAME} in