github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #20373 from bprashanth/l7_flaky 

Mark L7 tests as Feature:Ingress
pull/6/head
Jeff Lowdermilk 2016-02-02 18:24:15 -08:00
parent d4af417010 4f50292347
commit 136c1f9d94
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hack/jenkins/e2e.sh
View File

@ -361,6 +361,33 @@ case ${JOB_NAME} in
ADMISSION_CONTROL="NamespaceLifecycle,InitialResources,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota"
;;
# Runs only the ingress tests on GCE.
kubernetes-e2e-gce-ingress)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-ingress"}
: ${E2E_NETWORK:="e2e-ingress"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Feature:Ingress\]"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-ingress"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
# TODO: Move this into a different project. Currently, since this test
# shares resources with various other networking tests, so it's easier
# to zero in on the source of a leak if it's run in isolation.
: ${PROJECT:="kubernetes-flannel"}
;;
# Runs only the ingress tests on GKE.
kubernetes-e2e-gke-ingress)
: ${E2E_CLUSTER_NAME:="jenkins-gke-e2e-ingress"}
: ${E2E_NETWORK:="e2e-gke-ingress"}
: ${E2E_SET_CLUSTER_API_VERSION:=y}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Feature:Ingress\]"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-gke-ingress"}
# TODO: Move this into a different project. Currently, since this test
# shares resources with various other networking tests, it's easier to
# zero in on the source of a leak if it's run in isolation.
: ${PROJECT:="kubernetes-flannel"}
;;
# Runs the flaky tests on GCE, sequentially.
kubernetes-e2e-gce-flaky)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-flaky"}

10
hack/jenkins/job-configs/kubernetes-e2e.yaml
View File

@ -189,5 +189,15 @@
timeout: 300
emails: '$DEFAULT_RECIPIENTS, ihmccreery@google.com'
test-owner: 'ihmccreery'
- 'gke-ingress':
description: 'Run [Feature:Ingress] tests on GKE using the latest successful build.'
timeout: 90
emails: '$DEFAULT_RECIPIENTS, beeps@google.com'
test-owner: 'beeps'
- 'gce-ingress':
description: 'Run [Feature:Ingress] tests on GCE using the latest successful build.'
timeout: 90
emails: '$DEFAULT_RECIPIENTS, beeps@google.com'
test-owner: 'beeps'
jobs:
- 'kubernetes-e2e-{suffix}'

3
test/e2e/ingress.go
View File

@ -396,8 +396,7 @@ func (cont *IngressController) Cleanup(del bool) error {
// test requires at least 5.
//
// Slow by design (10 min)
// Flaky issue #17518
var _ = Describe("GCE L7 LoadBalancer Controller [Serial] [Slow] [Flaky]", func() {
var _ = Describe("GCE L7 LoadBalancer Controller [Feature:Ingress]", func() {
// These variables are initialized after framework's beforeEach.
var ns string
var addonDir string