From de3a36c904667b5271160ea063e4bb1e940ae741 Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Wed, 8 Jul 2015 15:55:53 +0200 Subject: [PATCH] Promote ElasticSearch test to non-flaky suite --- hack/jenkins/e2e.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 0a47a6e7372..9ba748094b6 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -68,7 +68,6 @@ fi # Specialized tests which should be skipped by default for projects. GCE_DEFAULT_SKIP_TEST_REGEX="\ Skipped|\ -Density|\ Reboot|\ Restart|\ Example\ @@ -76,8 +75,7 @@ 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\ +Shell.*services\ |MaxPods.*\ " # Tests which are not able to be run in parallel. @@ -92,10 +90,10 @@ ${GCE_DEFAULT_SKIP_TEST_REGEX}\ # 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\ +Elasticsearch\ |Hostdir.*MOD\ -|Networking.*intra|PD\ +|Networking.*intra\ +|PD\ |ServiceAccounts\ |Service\sendpoints\slatency\ |Services.*change\sthe\stype\