Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mark es logging test as Feature #21019

Merged
merged 2 commits into from
Feb 19, 2016
Merged

mark es logging test as Feature #21019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a33f11f
mark Elasticsearch test as Feature
freehan Feb 11, 2016
e4a03cd
Add elasticsearch suite
freehan Feb 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions hack/jenkins/e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,17 @@ case ${JOB_NAME} in
: ${PROJECT:="kubernetes-jenkins"}
;;

# Runs only the elasticsearch logging tests on GCE.
kubernetes-e2e-gce-es-logging)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You also need to add a config in hack/jenkins/job-configs/kubernetes-e2e.yaml

: ${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"}
Expand Down
5 changes: 5 additions & 0 deletions hack/jenkins/job-configs/kubernetes-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}'

Expand Down
3 changes: 1 addition & 2 deletions test/e2e/es_cluster_logging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down