github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #24176 from kubernetes/revert-24109-dockerized-e2e 

Revert "Run most GCE, GKE, and Kubemark e2e jobs inside Docker"
pull/6/head
Erick Fejta 2016-04-12 18:42:59 -07:00
parent 405656eff8 b2f8b1962f
commit bc8738c280
6 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/jenkins/job-configs/global.yaml
View File

@ -137,8 +137,8 @@
exit ${{rc}}
branch: 'master'
job-env: ''
runner: bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/dockerized-e2e-runner.sh")
legacy-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-0: bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.0/hack/jenkins/e2e.sh")
provider-env: ''

17
hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml
View File

@ -15,7 +15,8 @@
description: '{description} Test owner: {test-owner}.'
logrotate:
daysToKeep: 7
jenkins_node: 'e2e'
node: '{jenkins_node}'
jenkins_node: 'master'
disabled: '{obj:disable_job}'
builders:
- shell: |
@ -45,7 +46,6 @@
- job-template:
name: 'kubernetes-e2e-{suffix}'
<<: *e2e_job_defaults
node: '{jenkins_node}'
triggers:
- reverse:
jobs: '{trigger-job}'
@ -107,6 +107,8 @@
export KUBE_ADMISSION_CONTROL="NamespaceLifecycle,InitialResources,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota"
- 'gce-flaky':
description: 'Run the flaky tests on GCE, sequentially.'
jenkins_node: 'e2e'
runner: '{dockerized-runner}'
timeout: 180
job-env: |
export GINKGO_TEST_ARGS="--ginkgo.focus=\[Flaky\] \
@ -215,6 +217,8 @@
- client (kubectl): ci/latest.txt<br>
- cluster (k8s): ci/latest.txt<br>
- tests: ci/latest.txt
jenkins_node: 'e2e'
runner: '{dockerized-runner}'
timeout: 300
job-env: |
export PROJECT="k8s-jkns-e2e-gke-ci-flaky"
@ -435,7 +439,6 @@
trigger-job: 'kubernetes-build-1.1'
test-owner: 'Build Cop'
branch: 'release-1.1'
jenkins_node: 'master'
runner: '{old-runner-1-1}'
post-env: ''
suffix:
@ -452,7 +455,6 @@
trigger-job: 'kubernetes-build-1.1'
test-owner: 'Build Cop'
branch: 'release-1.1'
jenkins_node: 'master'
runner: '{old-runner-1-1}'
post-env: ''
cron-string: 'H */6 * * *'
@ -471,7 +473,6 @@
trigger-job: 'kubernetes-build-1.0'
test-owner: 'Build Cop'
branch: 'release-1.0'
jenkins_node: 'master'
runner: '{old-runner-1-0}'
post-env: ''
cron-string: 'H */12 * * *'
@ -543,8 +544,6 @@
cron-string: '@daily'
trigger-job: ''
timeout: 240
jenkins_node: 'master'
runner: '{legacy-runner}'
provider-env: |
{aws-provider-env}
export GINKGO_TEST_ARGS="--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]"
@ -625,7 +624,6 @@
- job-template:
name: 'kubernetes-e2e-gce-trusty-ci-{suffix}'
<<: *e2e_job_defaults
node: '{jenkins_node}'
triggers:
- reverse:
jobs: '{trigger-job}'
@ -721,7 +719,6 @@
- job-template:
name: 'kubernetes-e2e-gce-trusty-dev-{suffix}'
<<: *e2e_job_defaults
node: '{jenkins_node}'
triggers:
- timed: 'H H/8 * * *'
publishers:
@ -776,7 +773,6 @@
- job-template:
name: 'kubernetes-e2e-gce-trusty-{suffix}'
<<: *e2e_job_defaults
node: '{jenkins_node}'
triggers:
# Trusty beta and stable images are built once per day.
- timed: '@daily'
@ -798,7 +794,6 @@
test-owner: 'wonderfly@google.com'
branch: 'release-1.1'
emails: 'wonderfly@google.com,qzheng@google.com'
jenkins_node: 'master'
runner: '{old-runner-1-1}'
post-env: ''
suffix:

1
hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-kubemark.yaml
View File

@ -3,7 +3,6 @@
description: '{description} Test owner: gmarek'
logrotate:
daysToKeep: 7
node: 'e2e'
builders:
- shell: |
{provider-env}

6
hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-soak.yaml
View File

@ -3,14 +3,13 @@
description: '{deploy-description} Test owner: {test-owner}'
logrotate:
daysToKeep: 14
node: 'master'
builders:
- shell: |
{provider-env}
{soak-deploy}
{job-env}
{post-env}
timeout -k {kill-timeout}m 90m {legacy-runner} && rc=$? || rc=$?
timeout -k {kill-timeout}m 90m {runner} && rc=$? || rc=$?
{report-rc}
properties:
- build-blocker:
@ -37,14 +36,13 @@
workspace: '/var/lib/jenkins/jobs/kubernetes-soak-weekly-deploy-{suffix}/workspace'
logrotate:
daysToKeep: 7
node: 'master'
builders:
- shell: |
{provider-env}
{soak-continuous}
{job-env}
{post-env}
timeout -k {kill-timeout}m 360m {legacy-runner} && rc=$? || rc=$?
timeout -k {kill-timeout}m 360m {runner} && rc=$? || rc=$?
{report-rc}
properties:
- build-blocker:

3
hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-upgrades.yaml
View File

@ -12,7 +12,6 @@
project-type: multijob
triggers:
- timed: '@hourly'
node: 'master'
builders:
# TODO(ihmccreery) In theory, we could get ourselves into trouble by
# editing these things in the middle of a run. Jenkins Job Builder
@ -62,7 +61,6 @@
description: 'Deploy a cluster at {version-old} to be tested and upgraded to {version-new}. Test owner: ihmccreery.'
logrotate:
daysToKeep: 7
node: 'master'
builders:
- shell: |
# per-provider variables
@ -99,7 +97,6 @@
workspace: /var/lib/jenkins/jobs/kubernetes-upgrade-{provider}-{version-old}-{version-new}-step1-deploy/workspace/
logrotate:
daysToKeep: 7
node: 'master'
builders:
- shell: |
# per-provider variables

2
hack/jenkins/job-configs/kubernetes-jenkins/node-e2e.yaml
View File

@ -14,6 +14,7 @@
node: 'node'
logrotate:
numToKeep: 200
node: node
builders:
- docker-build-publish:
repoName: '{repoName}'
@ -63,6 +64,7 @@
node: 'node'
logrotate:
numToKeep: 200
node: node
builders:
- shell: |
#!/bin/bash