From 64f5ad65abc313b77ae2487621a9f0f983532c7d Mon Sep 17 00:00:00 2001 From: upodroid Date: Fri, 21 Jul 2023 11:58:31 +0300 Subject: [PATCH 1/2] ensure containerd folder OWNERS matches sig-node OWNERS --- config/jobs/containerd/containerd/OWNERS | 31 ++++++++++++++++-------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/config/jobs/containerd/containerd/OWNERS b/config/jobs/containerd/containerd/OWNERS index 708e50ee6dc0..0d3779e42137 100644 --- a/config/jobs/containerd/containerd/OWNERS +++ b/config/jobs/containerd/containerd/OWNERS @@ -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 From 8889084997064ff42b6aba2c443743f0daa0f989 Mon Sep 17 00:00:00 2001 From: upodroid Date: Fri, 21 Jul 2023 11:59:34 +0300 Subject: [PATCH 2/2] rework containerd build jobs --- .../containerd/containerd-periodic-jobs.yaml | 116 +++++++++++++++- .../containerd-postsubmit-jobs.yaml | 130 ++++++++++++++++++ .../jobs/kubernetes/sig-node/containerd.yaml | 96 +------------ .../kubernetes/containerd/config.yaml | 4 +- 4 files changed, 244 insertions(+), 102 deletions(-) create mode 100644 config/jobs/containerd/containerd/containerd-postsubmit-jobs.yaml diff --git a/config/jobs/containerd/containerd/containerd-periodic-jobs.yaml b/config/jobs/containerd/containerd/containerd-periodic-jobs.yaml index f7d826acd7b9..866f5e34b473 100644 --- a/config/jobs/containerd/containerd/containerd-periodic-jobs.yaml +++ b/config/jobs/containerd/containerd/containerd-periodic-jobs.yaml @@ -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: @@ -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" diff --git a/config/jobs/containerd/containerd/containerd-postsubmit-jobs.yaml b/config/jobs/containerd/containerd/containerd-postsubmit-jobs.yaml new file mode 100644 index 000000000000..fe9dd350b488 --- /dev/null +++ b/config/jobs/containerd/containerd/containerd-postsubmit-jobs.yaml @@ -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" diff --git a/config/jobs/kubernetes/sig-node/containerd.yaml b/config/jobs/kubernetes/sig-node/containerd.yaml index 8ceaa5d6b60f..f3a86d13dcd1 100644 --- a/config/jobs/kubernetes/sig-node/containerd.yaml +++ b/config/jobs/kubernetes/sig-node/containerd.yaml @@ -35,101 +35,7 @@ presets: value: containerd periodics: -- name: ci-containerd-build - interval: 30m - labels: - preset-service-account: "true" - preset-dind-enabled: "true" - cluster: default # don't move this job to the community cluster till the gs://cri-containerd-staging is owned by the community - decorate: true - extra_refs: - - org: containerd - repo: containerd - base_ref: main - spec: - containers: - - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230703-e6ae5b372a-master - command: - - runner.sh - args: - - test/build.sh - env: - - name: DEPLOY_DIR - value: master - resources: - limits: - cpu: 4 - memory: 6Gi - requests: - cpu: 4 - memory: 6Gi - securityContext: - privileged: true - annotations: - testgrid-dashboards: sig-node-containerd,containerd-periodic - testgrid-tab-name: containerd-build - description: "builds development in progress branch of upstream containerd" -- name: ci-containerd-build-1-6 - interval: 30m - labels: - preset-service-account: "true" - spec: - containers: - - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230703-e6ae5b372a-master - args: - - --repo=github.com/containerd/containerd=release/1.6 - - --root=/go/src - - --upload=gs://kubernetes-jenkins/logs - - --scenario=execute - - -- - - --env=DEPLOY_DIR=release-1.6 - - /go/src/github.com/containerd/containerd/test/build.sh - annotations: - testgrid-dashboards: sig-node-containerd,containerd-periodic - testgrid-tab-name: containerd-build-1.6 - description: "builds release/1.6 branch of upstream containerd" -- name: ci-containerd-build-test-images - interval: 4h - labels: - preset-service-account: "true" - preset-dind-enabled: "true" - spec: - containers: - - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230703-e6ae5b372a-master - args: - - --repo=github.com/containerd/containerd=main - - --root=/go/src - - --upload=gs://kubernetes-jenkins/logs - - --scenario=execute - - -- - - --env=DEPLOY_DIR=master - - /go/src/github.com/containerd/containerd/test/build-test-images.sh - # docker-in-docker needs privileged mode - securityContext: - privileged: true - annotations: - testgrid-dashboards: sig-node-containerd,containerd-periodic - testgrid-tab-name: containerd-build-test-images - description: "builds test images for development in progress branch of upstream containerd" -- name: ci-containerd-build-1-7 - interval: 30m - labels: - preset-service-account: "true" - spec: - containers: - - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230703-e6ae5b372a-master - args: - - --repo=github.com/containerd/containerd=release/1.7 - - --root=/go/src - - --upload=gs://kubernetes-jenkins/logs - - --scenario=execute - - -- - - --env=DEPLOY_DIR=release-1.7 - - /go/src/github.com/containerd/containerd/test/build.sh - annotations: - testgrid-dashboards: sig-node-containerd,containerd-periodic - testgrid-tab-name: containerd-build-1.7 - description: "builds release/1.7 branch of upstream containerd" +# containerd build PERIODICS have been moved to the config/jobs/containerd/containerd folder. Please don't add any in here. - name: ci-containerd-e2e-ubuntu-gce interval: 1h labels: diff --git a/config/testgrids/kubernetes/containerd/config.yaml b/config/testgrids/kubernetes/containerd/config.yaml index 13ac6b88b391..521b6d588270 100644 --- a/config/testgrids/kubernetes/containerd/config.yaml +++ b/config/testgrids/kubernetes/containerd/config.yaml @@ -3,7 +3,9 @@ dashboard_groups: dashboard_names: - containerd-presubmits - containerd-periodic + - containerd-postsubmits dashboards: - name: containerd-periodic - - name: containerd-presubmits \ No newline at end of file + - name: containerd-presubmits + - name: containerd-postsubmits