Commit fde35453 authored by Jeff Grafton's avatar Jeff Grafton

Use dockerized e2e for g[ck]e-flaky jobs, and run on the Jenkins slave

Force all other e2e jobs to run on master.
parent 25371101
...@@ -138,6 +138,7 @@ ...@@ -138,6 +138,7 @@
branch: 'master' branch: 'master'
job-env: '' job-env: ''
runner: bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh") runner: bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh")
dockerized-runner: bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/dockerized-e2e-runner.sh")
old-runner-1-1: bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.1/hack/jenkins/e2e.sh") old-runner-1-1: bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.1/hack/jenkins/e2e.sh")
old-runner-1-0: bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.0/hack/jenkins/e2e.sh") old-runner-1-0: bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.0/hack/jenkins/e2e.sh")
provider-env: '' provider-env: ''
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
description: '{description} Test owner: {test-owner}.' description: '{description} Test owner: {test-owner}.'
logrotate: logrotate:
daysToKeep: 7 daysToKeep: 7
node: '{jenkins_node}'
jenkins_node: 'master'
disabled: '{obj:disable_job}' disabled: '{obj:disable_job}'
builders: builders:
- shell: | - shell: |
...@@ -105,6 +107,8 @@ ...@@ -105,6 +107,8 @@
export KUBE_ADMISSION_CONTROL="NamespaceLifecycle,InitialResources,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota" export KUBE_ADMISSION_CONTROL="NamespaceLifecycle,InitialResources,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota"
- 'gce-flaky': - 'gce-flaky':
description: 'Run the flaky tests on GCE, sequentially.' description: 'Run the flaky tests on GCE, sequentially.'
jenkins_node: 'e2e'
runner: '{dockerized-runner}'
timeout: 180 timeout: 180
job-env: | job-env: |
export GINKGO_TEST_ARGS="--ginkgo.focus=\[Flaky\] \ export GINKGO_TEST_ARGS="--ginkgo.focus=\[Flaky\] \
...@@ -213,6 +217,8 @@ ...@@ -213,6 +217,8 @@
- client (kubectl): ci/latest.txt<br> - client (kubectl): ci/latest.txt<br>
- cluster (k8s): ci/latest.txt<br> - cluster (k8s): ci/latest.txt<br>
- tests: ci/latest.txt - tests: ci/latest.txt
jenkins_node: 'e2e'
runner: '{dockerized-runner}'
timeout: 300 timeout: 300
job-env: | job-env: |
export PROJECT="k8s-jkns-e2e-gke-ci-flaky" export PROJECT="k8s-jkns-e2e-gke-ci-flaky"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment