From e61f6614ca13e1cad2da10a45710e4bbfb8a8cb4 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Fri, 15 Jan 2016 11:07:36 -0800 Subject: [PATCH 1/2] Add gce-serial and gke-serial jobs to start deflaking serial, disruptive, and restart tests --- hack/jenkins/e2e.sh | 34 +++++++++++++++++++- hack/jenkins/job-configs/kubernetes-e2e.yaml | 26 +++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 392fa1aa356..6580d97f6bd 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -498,7 +498,7 @@ case ${JOB_NAME} in NUM_NODES=${NUM_NODES_PARALLEL} ;; - # Run the DISRUPTIVE_TESTS on GCE. (#19681) + # Run the Reboot tests on GCE. (#19681) kubernetes-e2e-gce-reboot) : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-reboot"} : ${E2E_NETWORK:="e2e-reboot"} @@ -507,6 +507,38 @@ case ${JOB_NAME} in : ${PROJECT:="kubernetes-jenkins"} ;; + # Run the [Serial], [Disruptive], and [Feature:Restart] tests on GCE. + kubernetes-e2e-gce-serial) + : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-serial"} + : ${E2E_NETWORK:="jenkins-gce-e2e-serial"} + : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} + : ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_no_empty \ + \[Serial\] \ + \[Disruptive\] \ + \[Feature:Restart\] \ + ) --ginkgo.skip=$(join_regex_no_empty \ + \[Flaky\] + )"} + : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-serial"} + : ${PROJECT:="kubernetes-jkns-e2e-gce-serial"} + ;; + + # Run the [Serial], [Disruptive], and [Feature:Restart] tests on GKE. + kubernetes-e2e-gke-serial) + : ${E2E_CLUSTER_NAME:="jenkins-gke-e2e-serial"} + : ${E2E_NETWORK:="jenkins-gke-e2e-serial"} + : ${E2E_SET_CLUSTER_API_VERSION:=y} + : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} + : ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_no_empty \ + \[Serial\] \ + \[Disruptive\] \ + \[Feature:Restart\] \ + ) --ginkgo.skip=$(join_regex_no_empty \ + \[Flaky\] + )"} + : ${PROJECT:="kubernetes-jkns-e2e-gke-serial"} + ;; + # Runs the performance/scalability tests on GCE. A larger cluster is used. kubernetes-e2e-gce-scalability) : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-scalability"} diff --git a/hack/jenkins/job-configs/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-e2e.yaml index 9790f75989e..3914f8cd7fd 100644 --- a/hack/jenkins/job-configs/kubernetes-e2e.yaml +++ b/hack/jenkins/job-configs/kubernetes-e2e.yaml @@ -189,3 +189,29 @@ description: 'Run E2E tests on GCE from the release-1.0 branch.' jobs: - 'kubernetes-e2e-{suffix}' + +- project: + name: kubernetes-e2e-gce-features + trigger-job: 'kubernetes-build' + branch: 'master' + suffix: + - 'gce-serial': + description: 'Run [Serial], [Disruptive], and [Feature:Restart] tests on GCE using the latest successful build.' + timeout: 300 + emails: '$DEFAULT_RECIPIENTS, ihmccreery@google.com' + test-owner: 'ihmccreery' + jobs: + - 'kubernetes-e2e-{suffix}' + +- project: + name: kubernetes-e2e-gke-features + trigger-job: 'kubernetes-build' + branch: 'master' + suffix: + - 'gke-serial': + description: 'Run [Serial], [Disruptive], and [Feature:Restart] tests on GKE using the latest successful build.' + timeout: 300 + emails: '$DEFAULT_RECIPIENTS, ihmccreery@google.com' + test-owner: 'ihmccreery' + jobs: + - 'kubernetes-e2e-{suffix}' From 78ea78e26b032ee700895a0fc5b62d7ce9a4d4e6 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Fri, 15 Jan 2016 15:16:00 -0800 Subject: [PATCH 2/2] Collapse into one project --- hack/jenkins/job-configs/kubernetes-e2e.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/hack/jenkins/job-configs/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-e2e.yaml index 3914f8cd7fd..fab56c186d4 100644 --- a/hack/jenkins/job-configs/kubernetes-e2e.yaml +++ b/hack/jenkins/job-configs/kubernetes-e2e.yaml @@ -191,7 +191,7 @@ - 'kubernetes-e2e-{suffix}' - project: - name: kubernetes-e2e-gce-features + name: kubernetes-e2e-features trigger-job: 'kubernetes-build' branch: 'master' suffix: @@ -200,14 +200,6 @@ timeout: 300 emails: '$DEFAULT_RECIPIENTS, ihmccreery@google.com' test-owner: 'ihmccreery' - jobs: - - 'kubernetes-e2e-{suffix}' - -- project: - name: kubernetes-e2e-gke-features - trigger-job: 'kubernetes-build' - branch: 'master' - suffix: - 'gke-serial': description: 'Run [Serial], [Disruptive], and [Feature:Restart] tests on GKE using the latest successful build.' timeout: 300