Merge pull request #23203 from bprashanth/ingress_1-2

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2016-03-19 16:33:40 -07:00
commit 9dd73505c4
1 changed files with 24 additions and 0 deletions

View File

@ -243,6 +243,16 @@
export GINKGO_TEST_ARGS="--ginkgo.focus=\[Serial\]|\[Disruptive\] \
--ginkgo.skip=\[Flaky\]|\[Feature:.+\]"
export PROJECT="k8s-jkns-e2e-gce-serial-1-2"
- 'gce-ingress-release-1.2':
description: 'Run [Feature:Ingress] tests on GCE on the release-1.2 branch.'
timeout: 90
emails: 'beeps@google.com'
test-owner: 'beeps'
job-env: |
export GINKGO_TEST_ARGS="--ginkgo.focus=\[Feature:Ingress\]"
export PROJECT="kubernetes-ingress"
# TODO: Enable this when we've split 1.2 tests into another project.
export FAIL_ON_GCP_RESOURCE_LEAK="false"
- 'gce-scalability-release-1.2':
timeout: 120
description: 'Run scalability E2E tests on GCE from the release-1.2 branch.'
@ -304,6 +314,16 @@
export GINKGO_TEST_ARGS="--ginkgo.focus=\[Slow\] \
--ginkgo.skip=\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]"
export GINKGO_PARALLEL="y"
- 'gke-ingress-release-1.2':
description: 'Run [Feature:Ingress] tests on GKE on the release-1.2 branch.'
timeout: 90
emails: 'beeps@google.com'
test-owner: 'beeps'
job-env: |
export GINKGO_TEST_ARGS="--ginkgo.focus=\[Feature:Ingress\]"
export PROJECT="kubernetes-gke-ingress"
# TODO: Enable this when we've split 1.2 tests into another project.
export FAIL_ON_GCP_RESOURCE_LEAK="false"
jobs:
- 'kubernetes-e2e-{suffix}'
@ -423,6 +443,8 @@
job-env: |
export GINKGO_TEST_ARGS="--ginkgo.focus=\[Feature:Ingress\]"
export PROJECT="kubernetes-gke-ingress"
# TODO: Enable this when we've split 1.2 tests into another project.
export FAIL_ON_GCP_RESOURCE_LEAK="false"
- 'gce-ingress':
description: 'Run [Feature:Ingress] tests on GCE.'
timeout: 90
@ -432,6 +454,8 @@
job-env: |
export GINKGO_TEST_ARGS="--ginkgo.focus=\[Feature:Ingress\]"
export PROJECT="kubernetes-ingress"
# TODO: Enable this when we've split 1.2 tests into another project.
export FAIL_ON_GCP_RESOURCE_LEAK="false"
- 'gce-flannel':
description: 'Run E2E tests on GCE using Flannel and the latest successful build. This suite is quarantined in a dedicated project because Flannel integration is experimental.'
# We don't really care to enforce a timeout for flannel tests. Any performance issues will show up in the other GCE builders.