Merge pull request #35689 from SergeyKanzhelev/cosVersionsCleanup

cleaned up some COS versions mapping

Author: k8s-ci-robot

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

@@ -586,7 +586,7 @@ periodics:
       - --gcp-nodes=4
       - --gcp-zone=us-central1-b
       - --ginkgo-parallel=30
-      - --image-family=cos-109-lts
+      - --image-family=cos-125-lts
       - --image-project=cos-cloud
       - --provider=gce
       - --test_args=--ginkgo.skip=\[Driver:.gcepd\]|\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[Feature:RuntimeHandler\] --minStartupPods=8
@@ -991,7 +991,7 @@ periodics:
       - --gcp-nodes=4
       - --gcp-zone=us-central1-b
       - --ginkgo-parallel=30
-      - --image-family=cos-stable
+      - --image-family=cos-121-lts # Use cos-121-lts to lock down what COS version is used with cgroupv1
       - --image-project=cos-cloud
       - --provider=gce
       - --test_args=--ginkgo.skip=\[Driver:.gcepd\]|\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[Feature:NodeSwap\] --minStartupPods=8

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

@@ -27,7 +27,7 @@ periodics:
         args:
           - --deployment=node
           - --gcp-zone=us-central1-b
-          - --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/image-config-v2.yaml
+          - --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/image-config.yaml
           - '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"'
           - --node-tests=true
           - --provider=gce

jobs/e2e_node/containerd/config-v2.toml

@@ -1,5 +1,5 @@
 images:
-  cos-stable:
-    image_family: cos-beta
+  cos:
+    image_family: cos-125-lts # keep as close to the COS version that has containerd version closest to the main branch as possible
     project: cos-cloud
     metadata: "user-data</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/init.yaml,containerd-configure-sh</home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-extra-init-sh</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/gci-init.sh,containerd-env</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main-presubmit/env,gci-update-strategy=update_disabled"

jobs/e2e_node/containerd/containerd-main-presubmit/image-config-presubmit.yaml

@@ -1,5 +1,5 @@
 images:
-  cos-stable:
-    image_family: cos-beta
+  cos:
+    image_family: cos-121-lts # Use cos-121-lts to lock down what COS version is used with cgroupv1
     project: cos-cloud
     metadata: "user-data</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/init.yaml,containerd-configure-sh</home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-extra-init-sh</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/gci-init.sh,containerd-env</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/cgroupv1/env-cgroupv1,gci-update-strategy=update_disabled"

jobs/e2e_node/containerd/containerd-main/cgroupv1/image-config-cgroupv1.yaml

@@ -1,6 +1,6 @@
 images:
-  cos-stable:
-    image_family: cos-beta
+  cos:
+    image_family: cos-125-lts # keep in sync with jobs/e2e_node/containerd/image-config.yaml
     project: cos-cloud
     machine: e2-standard-2 # These tests need a lot of memory
     metadata: "user-data</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/init.yaml,containerd-configure-sh</home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-extra-init-sh</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/gci-init.sh,containerd-env</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/cgroupv2/env-cgroupv2,gci-update-strategy=update_disabled"

jobs/e2e_node/containerd/containerd-main/cgroupv2/image-config-cgroupv2-serial.yaml

@@ -1,6 +1,5 @@
 images:
-  cos-stable:
-    # Using cos-beta to pick up cgroupv2 enabled by default as of cos-beta-97-16919-0-3.
-    image_family: cos-beta
+  cos:
+    image_family: cos-125-lts # keep in sync with jobs/e2e_node/containerd/image-config.yaml
     project: cos-cloud
     metadata: "user-data</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/init.yaml,containerd-configure-sh</home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-extra-init-sh</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/gci-init.sh,containerd-env</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/cgroupv2/env-cgroupv2,gci-update-strategy=update_disabled"

jobs/e2e_node/containerd/containerd-main/cgroupv2/image-config-cgroupv2.yaml

@@ -3,7 +3,7 @@ images:
     image_family: pipeline-1-29
     project: ubuntu-os-gke-cloud
     metadata: "user-data</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/init.yaml,containerd-configure-sh</home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-env</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/env"
-  cos-stable:
-    image_family: cos-beta
+  cos:
+    image_family: cos-125-lts # keep as close to the COS version that has containerd version closest to the main branch as possible
     project: cos-cloud
     metadata: "user-data</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/init.yaml,containerd-configure-sh</home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-extra-init-sh</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/gci-init.sh,containerd-env</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/env,gci-update-strategy=update_disabled"

jobs/e2e_node/containerd/containerd-main/image-config.yaml

@@ -4,8 +4,8 @@ images:
     project: ubuntu-os-gke-cloud
     machine: e2-standard-16  # node performance tests will be skipped on smaller machines
     metadata: "user-data</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/init.yaml,containerd-configure-sh</home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-env</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/env"
-  cos-stable:
-    image_family: cos-beta
+  cos:
+    image_family: cos-125-lts # keep as close to the COS version that has containerd version closest to the main branch as possible
     project: cos-cloud
     machine: e2-standard-16 # node performance tests will be skipped on smaller machines
     metadata: "user-data</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/init.yaml,containerd-configure-sh</home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-extra-init-sh</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/gci-init.sh,containerd-env</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/env,gci-update-strategy=update_disabled"

jobs/e2e_node/containerd/containerd-main/perf-image-config.yaml

@@ -1,5 +1,5 @@
 images:
-  cos-stable:
-    image_family: cos-beta
+  cos:
+    image_family: cos-117-lts # Use cos-117-lts to lock down what COS version is used with containerd 1.7, which aligns with COS's built-in containerd version
     project: cos-cloud
     metadata: "user-data</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/init.yaml,containerd-configure-sh</home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-extra-init-sh</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/gci-init.sh,containerd-env</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-release-1.7-presubmit/env,gci-update-strategy=update_disabled"