Skip to content

Commit

Permalink
Merge pull request #30025 from borg-land/optimise-containerd-jobs
Browse files Browse the repository at this point in the history
Migrate remaining containerd-build-* jobs to the community bucket and introduce postsubmit jobs
  • Loading branch information
k8s-ci-robot committed Jul 21, 2023
2 parents b99014a + 8889084 commit 8b3838c
Show file tree
Hide file tree
Showing 5 changed files with 265 additions and 112 deletions.
31 changes: 21 additions & 10 deletions config/jobs/containerd/containerd/OWNERS
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
# See the OWNERS docs at https://go.k8s.io/owners

reviewers:
- yujuhong
- Random-Liu
- dchen1107
- dims
- mikebrow
- bart0sh
- bobbypage
- derekwaynecarr
- endocrimes
- pacoxu
- sjenning
- SergeyKanzhelev
approvers:
- yujuhong
- Random-Liu
- dchen1107
- dims
- mikebrow
- yujuhong
- Random-Liu
- dchen1107
- derekwaynecarr
- sjenning
- mrunalp
- klueska
- SergeyKanzhelev
- endocrimes
emeritus_approvers:
- dashpole
- ehashman
labels:
- sig/node
116 changes: 110 additions & 6 deletions config/jobs/containerd/containerd/containerd-periodic-jobs.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# These CI/post-submit jobs are used by Kubernetes tests to fetch a recent build of containerd instead of building containerd on every run.
# The intervals are specifically set to 24h as these jobs also run as postsubmits for main and last 2 releases
periodics:
- name: ci-containerd-build-canary
interval: 30m
- name: ci-containerd-build
interval: 24h
labels:
preset-service-account: "true"
preset-dind-enabled: "true"
cluster: k8s-infra-prow-build
decorate: true
extra_refs:
Expand All @@ -30,9 +30,113 @@ periodics:
requests:
cpu: 4
memory: 6Gi
securityContext:
privileged: true
annotations:
testgrid-dashboards: sig-node-containerd,containerd-periodic
testgrid-tab-name: containerd-build-canary
testgrid-tab-name: ci-containerd-build
description: "builds development in progress branch of upstream containerd"

- name: ci-containerd-build-1-6
interval: 24h
labels:
preset-service-account: "true"
cluster: k8s-infra-prow-build
decorate: true
extra_refs:
- org: containerd
repo: containerd
base_ref: release/1.6
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230616-e730b60769-master
command:
- runner.sh
args:
- test/build.sh
env:
- name: DEPLOY_DIR
value: release-1.6
- name: DEPLOY_BUCKET
value: k8s-staging-cri-tools
resources:
limits:
cpu: 4
memory: 6Gi
requests:
cpu: 4
memory: 6Gi
annotations:
testgrid-dashboards: sig-node-containerd,containerd-periodic
testgrid-tab-name: ci-containerd-build-1.6
description: "builds release/1.6 branch of upstream containerd"

- name: ci-containerd-build-1-7
interval: 24h
labels:
preset-service-account: "true"
cluster: k8s-infra-prow-build
decorate: true
extra_refs:
- org: containerd
repo: containerd
base_ref: release/1.7
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230616-e730b60769-master
command:
- runner.sh
args:
- test/build.sh
env:
- name: DEPLOY_DIR
value: release-1.7
- name: DEPLOY_BUCKET
value: k8s-staging-cri-tools
resources:
limits:
cpu: 4
memory: 6Gi
requests:
cpu: 4
memory: 6Gi
annotations:
testgrid-dashboards: sig-node-containerd,containerd-periodic
testgrid-tab-name: ci-containerd-build-1.7
description: "builds release/1.7 branch of upstream containerd"

- name: ci-containerd-build-test-images
interval: 24h
labels:
preset-service-account: "true"
preset-dind-enabled: "true"
cluster: k8s-infra-prow-build
decorate: true
extra_refs:
- org: containerd
repo: containerd
base_ref: main
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230616-e730b60769-master
command:
- runner.sh
args:
- test/build-test-images.sh
env:
- name: DEPLOY_DIR
value: main
- name: PROJECT
value: k8s-staging-cri-tools
resources:
limits:
cpu: 4
memory: 6Gi
requests:
cpu: 4
memory: 6Gi
# docker-in-docker needs privileged mode
securityContext:
privileged: true
annotations:
testgrid-dashboards: sig-node-containerd,containerd-periodic
testgrid-tab-name: ci-containerd-build-test-images
description: "builds test images for development in progress branch of upstream containerd"
130 changes: 130 additions & 0 deletions config/jobs/containerd/containerd/containerd-postsubmit-jobs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
# These CI/post-submit jobs are used by Kubernetes tests to fetch a recent build of containerd instead of building containerd on every run.
postsubmits:
containerd/containerd:
- name: post-containerd-build
labels:
preset-service-account: "true"
cluster: k8s-infra-prow-build
decorate: true
branches:
- main
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230616-e730b60769-master
command:
- runner.sh
args:
- test/build.sh
env:
- name: DEPLOY_DIR
value: main
- name: DEPLOY_BUCKET
value: k8s-staging-cri-tools
resources:
limits:
cpu: 4
memory: 6Gi
requests:
cpu: 4
memory: 6Gi
annotations:
testgrid-dashboards: sig-node-containerd,containerd-postsubmits
testgrid-tab-name: post-containerd-build
description: "builds development in progress branch of upstream containerd"

- name: post-containerd-build-1-6
labels:
preset-service-account: "true"
cluster: k8s-infra-prow-build
decorate: true
branches:
- release/1.6
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230616-e730b60769-master
command:
- runner.sh
args:
- test/build.sh
env:
- name: DEPLOY_DIR
value: release-1.6
- name: DEPLOY_BUCKET
value: k8s-staging-cri-tools
resources:
limits:
cpu: 4
memory: 6Gi
requests:
cpu: 4
memory: 6Gi
annotations:
testgrid-dashboards: sig-node-containerd,containerd-postsubmits
testgrid-tab-name: post-containerd-build-1.6
description: "builds release/1.6 branch of upstream containerd"

- name: post-containerd-build-1-7
labels:
preset-service-account: "true"
cluster: k8s-infra-prow-build
decorate: true
branches:
- release/1.7
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230616-e730b60769-master
command:
- runner.sh
args:
- test/build.sh
env:
- name: DEPLOY_DIR
value: release-1.7
- name: DEPLOY_BUCKET
value: k8s-staging-cri-tools
resources:
limits:
cpu: 4
memory: 6Gi
requests:
cpu: 4
memory: 6Gi
annotations:
testgrid-dashboards: sig-node-containerd,containerd-postsubmits
testgrid-tab-name: post-containerd-build-1.7
description: "builds release/1.7 branch of upstream containerd"

- name: post-containerd-build-test-images
labels:
preset-service-account: "true"
preset-dind-enabled: "true"
cluster: k8s-infra-prow-build
decorate: true
branches:
- main
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230616-e730b60769-master
command:
- runner.sh
args:
- test/build-test-images.sh
env:
- name: DEPLOY_DIR
value: main
- name: PROJECT
value: k8s-staging-cri-tools
resources:
limits:
cpu: 4
memory: 6Gi
requests:
cpu: 4
memory: 6Gi
# docker-in-docker needs privileged mode
securityContext:
privileged: true
annotations:
testgrid-dashboards: sig-node-containerd,containerd-postsubmits
testgrid-tab-name: post-containerd-build-test-images
description: "builds test images for development in progress branch of upstream containerd"
Loading

0 comments on commit 8b3838c

Please sign in to comment.