Merge pull request #35652 from SergeyKanzhelev/containerd16nomore

remove all containerd 1.6 jobs as it is EoL now

Author: k8s-ci-robot

config/jobs/containerd/containerd/containerd-periodic-jobs.yaml

@@ -71,40 +71,6 @@ periodics:
     testgrid-tab-name: ci-containerd-arm64-build
     description: "builds development in progress branch of upstream containerd (arm64)"
 
-- 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:v20250925-95b5a2c7a5-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
   cron: "0 7,19 * * *" # Run twice a day - ensure this is the same time as ci-containerd-arm64-build-1-7
   labels:

config/jobs/containerd/containerd/containerd-postsubmit-jobs.yaml

@@ -32,37 +32,6 @@ 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:v20250925-95b5a2c7a5-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"

config/jobs/containerd/containerd/containerd-presubmit-jobs.yaml

@@ -6,7 +6,6 @@ presubmits:
     cluster: k8s-infra-prow-build
     branches:
     - main
-    - release/1.6
     - release/1.7
     - release/2.0
     - release/2.1
@@ -214,123 +213,6 @@ presubmits:
             cpu: 4
             memory: 6Gi
 
-  - name: pull-containerd-node-e2e-1-6
-    always_run: true
-    cluster: k8s-infra-prow-build
-    max_concurrency: 8
-    decorate: true
-    branches:
-    - release/1.6
-    decoration_config:
-      timeout: 100m
-    extra_refs:
-    - org: kubernetes
-      repo: kubernetes
-      base_ref: master
-      path_alias: k8s.io/kubernetes
-    - org: kubernetes
-      repo: test-infra
-      base_ref: master
-      path_alias: k8s.io/test-infra
-    annotations:
-      testgrid-dashboards: sig-node-containerd,containerd-presubmits
-      testgrid-tab-name: pull-containerd-node-e2e-1-6
-      description: run node e2e tests
-    labels:
-      preset-service-account: "true"
-      preset-k8s-ssh: "true"
-    spec:
-      containers:
-      - name: pull-containerd-node-e2e-1-6
-        image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250925-95b5a2c7a5-master
-        env:
-        - name: USE_TEST_INFRA_LOG_DUMPING
-          value: "true"
-        command:
-        - sh
-        - -c
-        - >
-          runner.sh
-          ./test/build.sh
-          &&
-          cd ${GOPATH}/src/k8s.io/kubernetes
-          &&
-          /workspace/scenarios/kubernetes_e2e.py
-          --deployment=node
-          --gcp-zone=us-central1-f
-          '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/home/containerd/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service"'
-          --node-tests=true
-          --provider=gce
-          '--test_args=--nodes=8 --focus="\[NodeConformance\]|\[Feature:.+\]|\[Feature\]" --skip="\[Flaky\]|\[Slow\]|\[Serial\]|\[Feature:UserNamespacesSupport\]|\[Feature:PodLifecycleSleepActionAllowZero\]|\[Feature:UserNamespacesPodSecurityStandards\]|\[Feature:KubeletCredentialProviders\]|\[Feature:LockContention\]|\[Feature:SCTPConnectivity\]|\[Alpha\]"'
-          --timeout=65m
-          "--node-args=--image-config-file=${GOPATH}/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-release-1.6-presubmit/image-config-presubmit.yaml -node-env=PULL_REFS=$(PULL_REFS)"
-        resources:
-          limits:
-            cpu: 4
-            memory: 6Gi
-          requests:
-            cpu: 4
-            memory: 6Gi
-
-  - name: pull-containerd-node-e2e-1-6-systemd-cgroup
-    always_run: false
-    optional: true
-    cluster: k8s-infra-prow-build
-    max_concurrency: 8
-    decorate: true
-    branches:
-    - release/1.6
-    decoration_config:
-      timeout: 100m
-    extra_refs:
-    - org: kubernetes
-      repo: kubernetes
-      base_ref: master
-      path_alias: k8s.io/kubernetes
-    - org: kubernetes
-      repo: test-infra
-      base_ref: master
-      path_alias: k8s.io/test-infra
-    annotations:
-      testgrid-dashboards: sig-node-containerd,containerd-presubmits
-      testgrid-tab-name: pull-containerd-node-e2e-1-6-systemd-cgroup
-      description: run node e2e tests
-    labels:
-      preset-service-account: "true"
-      preset-k8s-ssh: "true"
-    spec:
-      containers:
-      - name: pull-containerd-node-e2e-1-6
-        image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250925-95b5a2c7a5-master
-        env:
-        - name: USE_TEST_INFRA_LOG_DUMPING
-          value: "true"
-        command:
-        - sh
-        - -c
-        - >
-          runner.sh
-          ./test/build.sh
-          &&
-          cd ${GOPATH}/src/k8s.io/kubernetes
-          &&
-          /workspace/scenarios/kubernetes_e2e.py
-          --deployment=node
-          --gcp-zone=us-central1-f
-          '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/home/containerd/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service"'
-          --node-tests=true
-          --provider=gce
-          '--test_args=--nodes=8 --focus="\[NodeConformance\]|\[Feature:.+\]|\[Feature\]" --skip="\[Flaky\]|\[Slow\]|\[Serial\]|\[Feature:UserNamespacesSupport\]|\[Feature:PodLifecycleSleepActionAllowZero\]|\[Feature:UserNamespacesPodSecurityStandards\]|\[Feature:KubeletCredentialProviders\]|\[Feature:LockContention\]|\[Feature:SCTPConnectivity\]"'
-          --timeout=65m
-          "--node-args=--image-config-file=${GOPATH}/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-release-1.6-systemd-cgroup-presubmit/image-config-presubmit.yaml -node-env=PULL_REFS=$(PULL_REFS)"
-        resources:
-          limits:
-            cpu: 4
-            memory: 6Gi
-          requests:
-            cpu: 4
-            memory: 6Gi
-
   - name: pull-containerd-k8s-e2e-ec2
     branches:
     - main

config/jobs/kubernetes/sig-node/containerd.yaml

@@ -245,58 +245,6 @@ periodics:
     testgrid-dashboards: sig-node-containerd
     testgrid-tab-name: cos-cgroupv1-containerd-node-e2e-serial
     testgrid-alert-email: [email protected]
-- name: ci-containerd-node-e2e-1-6
-  cluster: k8s-infra-prow-build
-  interval: 24h
-  labels:
-    preset-service-account: "true"
-    preset-k8s-ssh: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kubernetes
-    base_ref: master
-    path_alias: k8s.io/kubernetes
-    workdir: true
-  - org: containerd
-    repo: containerd
-    base_ref: release/1.6
-    path_alias: github.com/containerd/containerd
-  - org: kubernetes
-    repo: test-infra
-    base_ref: master
-    path_alias: k8s.io/test-infra
-  spec:
-    containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250925-95b5a2c7a5-master
-      command:
-        - runner.sh
-        - /workspace/scenarios/kubernetes_e2e.py
-      args:
-      - --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-release-1.6/image-config.yaml
-      - --deployment=node
-      - --gcp-zone=us-central1-b
-      - '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/home/containerd/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service"'
-      - --node-tests=true
-      - --provider=gce
-      - --test_args=--nodes=8 --focus="\[NodeConformance\]" --skip="\[Flaky\]|\[Serial\]"
-      - --timeout=65m
-      env:
-      - name: GOPATH
-        value: /go
-      resources:
-        limits:
-          cpu: 4
-          memory: 6Gi
-        requests:
-          cpu: 4
-          memory: 6Gi
-  annotations:
-    testgrid-dashboards: sig-node-containerd
-    testgrid-tab-name: containerd-node-e2e-1.6
-    testgrid-alert-email: [email protected]
 - name: ci-containerd-node-e2e-1-7
   cluster: k8s-infra-prow-build
   interval: 24h
@@ -349,58 +297,6 @@ periodics:
     testgrid-dashboards: sig-node-containerd
     testgrid-tab-name: containerd-node-e2e-1.7
     testgrid-alert-email: [email protected]
-- name: ci-containerd-node-e2e-features-1-6
-  cluster: k8s-infra-prow-build
-  interval: 24h
-  labels:
-    preset-service-account: "true"
-    preset-k8s-ssh: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kubernetes
-    base_ref: master
-    path_alias: k8s.io/kubernetes
-    workdir: true
-  - org: containerd
-    repo: containerd
-    base_ref: release/1.6
-    path_alias: github.com/containerd/containerd
-  - org: kubernetes
-    repo: test-infra
-    base_ref: master
-    path_alias: k8s.io/test-infra
-  spec:
-    containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250925-95b5a2c7a5-master
-      command:
-        - runner.sh
-        - /workspace/scenarios/kubernetes_e2e.py
-      args:
-      - --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-release-1.6/image-config.yaml
-      - --deployment=node
-      - --gcp-zone=us-central1-b
-      - '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/home/containerd/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service"'
-      - --node-tests=true
-      - --provider=gce
-      - --test_args=--nodes=8 --focus="\[Feature:.+\]|\[Feature\]" --skip="\[Flaky\]|\[Serial\]|\[Feature:InPlacePodVerticalScaling\]|\[Feature:UserNamespacesSupport\]|\[Feature:UserNamespacesStatelessPodsSupport\]|\[Feature:UserNamespacesPodSecurityStandards\]|\[Feature:KubeletCredentialProviders\]|\[Feature:LockContention\]|\[Feature:SCTPConnectivity\]|\[Alpha\]"
-      - --timeout=65m
-      env:
-      - name: GOPATH
-        value: /go
-      resources:
-        limits:
-          cpu: 4
-          memory: 6Gi
-        requests:
-          cpu: 4
-          memory: 6Gi
-  annotations:
-    testgrid-dashboards: sig-node-containerd
-    testgrid-tab-name: containerd-node-e2e-features-1.6
-    testgrid-alert-email: [email protected]
 - name: ci-containerd-node-e2e-features-1-7
   cluster: k8s-infra-prow-build
   interval: 24h