From 372635588746fa2bebae68a3878219cba50c8546 Mon Sep 17 00:00:00 2001 From: Prashanth Balasubramanian Date: Sat, 30 Jan 2016 12:13:12 -0800 Subject: [PATCH 1/2] Mark L7 tests as Feature:Ingress --- test/e2e/ingress.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/e2e/ingress.go b/test/e2e/ingress.go index 6a5c7c7126..3adfd3ff9e 100644 --- a/test/e2e/ingress.go +++ b/test/e2e/ingress.go @@ -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 From 4f50292347642b31d4c22cb8fcc0c141b26a557f Mon Sep 17 00:00:00 2001 From: Prashanth Balasubramanian Date: Sat, 30 Jan 2016 12:56:47 -0800 Subject: [PATCH 2/2] Create new ingress suite. --- hack/jenkins/e2e.sh | 27 ++++++++++++++++++++ hack/jenkins/job-configs/kubernetes-e2e.yaml | 10 ++++++++ 2 files changed, 37 insertions(+) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 9897713096..d90c5fabdb 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -364,6 +364,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"} diff --git a/hack/jenkins/job-configs/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-e2e.yaml index 354f8a3e64..743737f9c3 100644 --- a/hack/jenkins/job-configs/kubernetes-e2e.yaml +++ b/hack/jenkins/job-configs/kubernetes-e2e.yaml @@ -212,5 +212,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}'