diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index b37fdb56a6b..a2fab68e24f 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -261,6 +261,17 @@ case ${JOB_NAME} in export PROJECT="k8s-jkns-e2e-examples" ;; + # 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) export GINKGO_TEST_ARGS="--ginkgo.focus=\[Feature:ClusterSizeAutoscaling\]|\[Feature:InitialResources\] \ diff --git a/hack/jenkins/job-configs/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-e2e.yaml index f794ca7dbdf..b476cdabd60 100644 --- a/hack/jenkins/job-configs/kubernetes-e2e.yaml +++ b/hack/jenkins/job-configs/kubernetes-e2e.yaml @@ -274,6 +274,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}' diff --git a/test/e2e/es_cluster_logging.go b/test/e2e/es_cluster_logging.go index c700649734e..b48cfcbe5f6 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() {