diff --git a/hack/jenkins/job-configs/global.yaml b/hack/jenkins/job-configs/global.yaml index 1ddc38552a..6a04d68529 100644 --- a/hack/jenkins/job-configs/global.yaml +++ b/hack/jenkins/job-configs/global.yaml @@ -57,3 +57,8 @@ 100.0 + +# Default email recipients are set in Jenkins global config +- defaults: + name: global + emails: '$DEFAULT_RECIPIENTS' diff --git a/hack/jenkins/job-configs/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-e2e.yaml index 1dff54e1fc..9d11739fde 100644 --- a/hack/jenkins/job-configs/kubernetes-e2e.yaml +++ b/hack/jenkins/job-configs/kubernetes-e2e.yaml @@ -13,7 +13,8 @@ - junit-publisher - gcs-uploader - log-parser - - email-ext + - email-ext: + recipients: "{emails}" triggers: - reverse: jobs: '{trigger-job}' @@ -29,7 +30,7 @@ - workspace-cleanup - project: - name: kubernetes-e2e + name: kubernetes-e2e-gce-master trigger-job: 'kubernetes-build' test-owner: 'Build Cop' branch: 'master' @@ -61,6 +62,16 @@ - '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.' timeout: 90 + jobs: + - 'kubernetes-e2e-{suffix}' + +- project: + name: kubernetes-e2e-gke-master + trigger-job: 'kubernetes-build' + test-owner: 'GKE on-call' + branch: 'master' + emails: '$DEFAULT_RECIPIENTS, cloud-kubernetes-alerts@google.com' + suffix: - 'gke-ci': description: | Run e2e tests using the following config:
@@ -81,5 +92,100 @@ - cluster (k8s): ci/latest.txt
- tests: ci/latest.txt timeout: 120 + - 'gke-flaky': + description: | + Run flaky e2e tests using the following config:
+ - provider: GKE
+ - apiary: staging
+ - borg job: test
+ - client (kubectl): ci/latest.txt
+ - cluster (k8s): ci/latest.txt
+ - tests: ci/latest.txt + timeout: 300 + jobs: + - 'kubernetes-e2e-{suffix}' + +- project: + name: kubernetes-e2e-gke-1.1 + trigger-job: 'kubernetes-build-1.1' + test-owner: 'GKE on-call' + branch: 'release-1.1' + emails: '$DEFAULT_RECIPIENTS, cloud-kubernetes-alerts@google.com' + suffix: + - 'gke-1.1': + timeout: 150 + description: 'Run E2E tests on GKE from the current release branch.' + - 'gke-prod': + timeout: 180 + description: | + Run e2e tests using the following config:
+ - provider: GKE
+ - apiary: prod
+ - borg job: prod
+ - client (kubectl): release/stable.txt
+ - cluster (k8s): release/stable.txt
+ - tests: release/stable.txt + - 'gke-staging': + timeout: 300 + description: | + Run e2e tests using the following config:
+ - provider: GKE
+ - apiary: staging
+ - borg job: staging
+ - client (kubectl): release/stable.txt
+ - cluster (k8s): release/stable.txt
+ - tests: release/stable.txt + - 'gke-subnet': + test-owner: 'cjcullen' + timeout: 300 + description: | + Run e2e tests using the following config:
+ - provider: GKE
+ - apiary: prod
+ - borg job: prod
+ - client (kubectl): release/stable.txt
+ - cluster (k8s): release/stable.txt
+ - tests: release/stable.txt + emails: 'cjcullen@google.com' + - 'gke-test': + timeout: 300 + description: | + Run e2e tests using the following config:
+ - provider: GKE
+ - apiary: staging
+ - borg job: test
+ - client (kubectl): release/stable.txt
+ - cluster (k8s): release/stable.txt
+ - tests: release/stable.txt + jobs: + - 'kubernetes-e2e-{suffix}' + +- project: + name: kubernetes-e2e-gce-1.1 + trigger-job: 'kubernetes-build-1.1' + test-owner: 'Build Cop' + branch: 'release-1.1' + suffix: + - 'gce-release-1.1': + timeout: 175 + description: 'Run E2E tests on GCE from the current release branch.' + - 'gce-disruptive-1.1': + timeout: 180 + description: 'Run disruptive E2E tests on GCE from the current release branch.' + - 'gce-scalability-1.1': + timeout: 210 + description: 'Run scalability E2E tests on GCE from the current release branch.' + jobs: + - 'kubernetes-e2e-{suffix}' + +- project: + name: kubernetes-e2e-1.0 + trigger-job: 'kubernetes-build-1.0' + test-owner: 'Build Cop' + branch: 'release-1.0' + suffix: + - 'gce-release-1.0': + timeout: 150 + description: 'Run E2E tests on GCE from the release-1.0 branch.' jobs: - 'kubernetes-e2e-{suffix}'