Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update integration jobs to use podutils and not kubekins-test #15156

Merged
merged 4 commits into from
Nov 7, 2019
Merged

update integration jobs to use podutils and not kubekins-test #15156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a013810
update master branch integration periodic to podutils
BenTheElder Nov 7, 2019
111d739
switch to podutils for 1.17 CI integration
BenTheElder Nov 7, 2019
6780e73
enable job forking for pull-kubernetes-integration
BenTheElder Nov 7, 2019
a9d485a
add 1.17 pull-kubernetes-integration
BenTheElder Nov 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions config/jobs/kubernetes/sig-release/release-branch-jobs/1.17.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,23 +336,25 @@ periodics:
preset-dind-enabled: "true"
preset-service-account: "true"
name: ci-kubernetes-integration-beta
decorate: true
extra_refs:
- org: kubernetes
repo: kubernetes
base_ref: release-1.17
path_alias: k8s.io/kubernetes
spec:
containers:
- args:
- --repo=k8s.io/kubernetes=release-1.17
- --timeout=100
- --scenario=kubernetes_verify
- --
- --branch=release-1.17
- --force
- --prow
image: gcr.io/k8s-testimages/bootstrap:v20191021-5489305
name: ""
resources:
requests:
cpu: "4"
- image: gcr.io/k8s-testimages/kubekins-e2e:v20191106-09649c7-1.17
command:
- runner.sh
args:
- ./hack/jenkins/test-dockerized.sh
# docker-in-docker needs privileged mode
securityContext:
privileged: true
resources:
requests:
cpu: 4
- annotations:
fork-per-release-generic-suffix: "true"
fork-per-release-periodic-interval: 2h 6h 24h
Expand Down
53 changes: 40 additions & 13 deletions config/jobs/kubernetes/sig-testing/integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ presubmits:
kubernetes/kubernetes:
- name: pull-kubernetes-integration
always_run: true
skip_branches:
branches:
# we migrated to podutils for v1.17+
- master
- release-1.16
- release-1.15
- release-1.14
labels:
preset-service-account: "true"
preset-dind-enabled: "true"
Expand All @@ -27,23 +29,46 @@ presubmits:
resources:
requests:
cpu: 4
# this replaces the bootstrap / scenario based job going forward
- name: pull-kubernetes-integration
always_run: true
decorate: true
skip_branches:
- release-\d+.\d+ # per-release job
annotations:
fork-per-release: "true"
testgrid-num-failures-to-alert: '10'
testgrid-alert-stale-results-hours: '24'
testgrid-create-test-group: 'true'
# this replaces the bootstrap / scenario based job going forward
path_alias: k8s.io/kubernetes
labels:
preset-service-account: "true"
preset-dind-enabled: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20191106-09649c7-master
command:
- runner.sh
args:
- ./hack/jenkins/test-dockerized.sh
# docker-in-docker needs privileged mode
securityContext:
privileged: true
resources:
requests:
cpu: 4
- name: pull-kubernetes-integration
always_run: true
decorate: true
branches:
- master
- release-1.17 # per-release job
path_alias: k8s.io/kubernetes
labels:
preset-service-account: "true"
preset-dind-enabled: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20191106-09649c7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20191106-09649c7-1.17
command:
- runner.sh
args:
Expand All @@ -57,6 +82,12 @@ presubmits:
periodics:
- interval: 1h
name: ci-kubernetes-integration-master
decorate: true
extra_refs:
- org: kubernetes
repo: kubernetes
base_ref: master
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this get replaced as well with a fork-per-release?

path_alias: k8s.io/kubernetes
labels:
preset-service-account: "true"
preset-dind-enabled: "true"
Expand All @@ -70,15 +101,11 @@ periodics:
description: "Ends up running: make test-cmd test-integration"
spec:
containers:
- image: gcr.io/k8s-testimages/bootstrap:v20191021-5489305
- image: gcr.io/k8s-testimages/kubekins-e2e:v20191106-09649c7-master
command:
- runner.sh
args:
- --repo=k8s.io/kubernetes
- --timeout=100
- --scenario=kubernetes_verify
- --
- --branch=master
- --force
- --prow
- ./hack/jenkins/test-dockerized.sh
# docker-in-docker needs privileged mode
securityContext:
privileged: true
Expand Down