From a33f11f225a7e34609a16b155c030a6b1b327a4f Mon Sep 17 00:00:00 2001
From: Minhan Xia <mixia@google.com>
Date: Wed, 10 Feb 2016 16:07:13 -0800
Subject: [PATCH 1/2] mark Elasticsearch test as Feature

---
 test/e2e/es_cluster_logging.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/e2e/es_cluster_logging.go b/test/e2e/es_cluster_logging.go
index 93775bada5a..b00c8025944 100644
--- a/test/e2e/es_cluster_logging.go
+++ b/test/e2e/es_cluster_logging.go
@@ -30,8 +30,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-// Flaky issue #17873
-var _ = Describe("Cluster level logging using Elasticsearch [Flaky]", func() {
+var _ = Describe("Cluster level logging using Elasticsearch [Feature:Elasticsearch]", func() {
 	f := NewFramework("es-logging")
 
 	BeforeEach(func() {

From e4a03cddca86fde6c5d45d1f6a9c5329e59827bc Mon Sep 17 00:00:00 2001
From: Minhan Xia <mixia@google.com>
Date: Wed, 10 Feb 2016 16:18:43 -0800
Subject: [PATCH 2/2] Add elasticsearch suite

---
 hack/jenkins/e2e.sh                          | 11 +++++++++++
 hack/jenkins/job-configs/kubernetes-e2e.yaml |  5 +++++
 2 files changed, 16 insertions(+)

diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index 60eb7c33f4d..c8dbe88c27d 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -412,6 +412,17 @@ case ${JOB_NAME} in
     : ${PROJECT:="kubernetes-jenkins"}
     ;;
 
+  # Runs only the elasticsearch logging tests on GCE.
+  kubernetes-e2e-gce-es-logging)
+    : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-es-logging"}
+    : ${E2E_NETWORK:="e2e-es-logging"}
+    : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Feature:Elasticsearch\]"}
+    : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-es-logging"}
+    : ${PROJECT:="kubernetes-es-logging"}
+    # Enable elasticsearch logging addon
+    KUBE_LOGGING_DESTINATION="elasticsearch"
+    ;;
+
   # Runs only the autoscaling tests on GCE.
   kubernetes-e2e-gce-autoscaling)
     : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-autoscaling"}
diff --git a/hack/jenkins/job-configs/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-e2e.yaml
index 65c2dd6bb99..7058172e416 100644
--- a/hack/jenkins/job-configs/kubernetes-e2e.yaml
+++ b/hack/jenkins/job-configs/kubernetes-e2e.yaml
@@ -199,6 +199,11 @@
             timeout: 90
             emails: '$DEFAULT_RECIPIENTS, beeps@google.com'
             test-owner: 'beeps'
+        - 'gce-es-logging':
+            description: 'Run [Feature:Elasticsearch] tests on GCE using the latest successful build.'
+            timeout: 90
+            emails: '$DEFAULT_RECIPIENTS, mixia@google.com'
+            test-owner: 'mixia'
     jobs:
         - 'kubernetes-e2e-{suffix}'