Create containerd 1.5 canaries

kubernetes · Aug 11, 2021 · e31dab9 · e31dab9
1 parent 2e2328e
commit e31dab9
Show file tree

Hide file tree

Showing 3 changed files with 122 additions and 0 deletions.
diff --git a/config/jobs/kubernetes/wg-k8s-infra/canaries/sig-node-containerd.yaml b/config/jobs/kubernetes/wg-k8s-infra/canaries/sig-node-containerd.yaml
@@ -59,6 +59,35 @@ periodics:
     testgrid-dashboards: wg-k8s-infra-canaries
     testgrid-tab-name: containerd-build-1.4-canary
     description: "builds release/1.4 branch of upstream containerd"
+- name: ci-containerd-build-1-5-canary
+  interval: 30m
+  cluster: k8s-infra-prow-build
+  labels:
+    preset-service-account: "true"
+  spec:
+    containers:
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20210721-2b77449-master
+        args:
+          - --repo=github.com/containerd/containerd=release/1.5
+          - --repo=github.com/containerd/cri=release/1.5
+          - --root=/go/src
+          - --upload=gs://kubernetes-jenkins/logs
+          - --scenario=execute
+          - --
+          - --env=GO111MODULE=off
+          - --env=DEPLOY_DIR=containerd/release-1.5
+          - /go/src/github.com/containerd/cri/test/containerd/build.sh
+        resources:
+          limits:
+            cpu: 4
+            memory: 8Gi
+          requests:
+            cpu: 4
+            memory: 8Gi
+  annotations:
+    testgrid-dashboards: wg-k8s-infra-canaries
+    testgrid-tab-name: containerd-build-1.5-canary
+    description: "builds release/1.5 branch of upstream containerd"
 - name: ci-containerd-build-test-images-canary
   interval: 4h
   cluster: k8s-infra-prow-build
@@ -275,6 +304,44 @@ periodics:
   annotations:
     testgrid-dashboards: wg-k8s-infra-canaries
     testgrid-tab-name: containerd-node-e2e-1.4-canary
+- name: ci-containerd-node-e2e-1-5-canary
+  interval: 1h
+  cluster: k8s-infra-prow-build
+  labels:
+    preset-service-account: "true"
+    preset-k8s-ssh: "true"
+  spec:
+    containers:
+    - image: gcr.io/k8s-testimages/kubekins-e2e:v20210721-2b77449-master
+      args:
+      - --root=/go/src
+      - --repo=k8s.io/kubernetes=release-1.21
+      - --repo=github.com/containerd/cri=release/1.5
+      - --timeout=90
+      - --scenario=kubernetes_e2e
+      - --
+      - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.5/image-config.yaml
+      - --deployment=node
+      - --gcp-project-type=gce-project
+      - --gcp-zone=us-central1-b
+      - '--node-test-args=--container-runtime=remote --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" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"'
+      - --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: 8Gi
+        requests:
+          cpu: 4
+          memory: 8Gi
+  annotations:
+    testgrid-dashboards: wg-k8s-infra-canaries
+    testgrid-tab-name: containerd-node-e2e-1.5-canary
 - name: ci-containerd-node-e2e-features-canary
   interval: 1h
   cluster: k8s-infra-prow-build
@@ -351,6 +418,44 @@ periodics:
   annotations:
     testgrid-dashboards: wg-k8s-infra-canaries
     testgrid-tab-name: containerd-node-e2e-features-1.4-canary
+- name: ci-containerd-node-e2e-features-1-5-canary
+  interval: 1h
+  cluster: k8s-infra-prow-build
+  labels:
+    preset-service-account: "true"
+    preset-k8s-ssh: "true"
+  spec:
+    containers:
+    - image: gcr.io/k8s-testimages/kubekins-e2e:v20210721-2b77449-master
+      args:
+      - --root=/go/src
+      - --repo=k8s.io/kubernetes=release-1.21
+      - --repo=github.com/containerd/cri=release/1.5
+      - --timeout=90
+      - --scenario=kubernetes_e2e
+      - --
+      - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.5/image-config.yaml
+      - --deployment=node
+      - --gcp-project-type=gce-project
+      - --gcp-zone=us-central1-b
+      - '--node-test-args=--container-runtime=remote --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" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"'
+      - --node-tests=true
+      - --provider=gce
+      - --test_args=--nodes=8 --focus="\[NodeFeature:.+\]|\[NodeFeature\]" --skip="\[Flaky\]|\[Serial\]"
+      - --timeout=65m
+      env:
+      - name: GOPATH
+        value: /go
+      resources:
+        limits:
+          cpu: 4
+          memory: 8Gi
+        requests:
+          cpu: 4
+          memory: 8Gi
+  annotations:
+    testgrid-dashboards: wg-k8s-infra-canaries
+    testgrid-tab-name: containerd-node-e2e-features-1.5-canary
 - name: ci-cri-containerd-e2e-gce-device-plugin-gpu-canary
   cron: "30 1-23/3 * * *"
   cluster: k8s-infra-prow-build

diff --git a/jobs/e2e_node/containerd/containerd-release-1.5/env b/jobs/e2e_node/containerd/containerd-release-1.5/env
@@ -0,0 +1,8 @@
+CONTAINERD_TEST: 'true'
+CONTAINERD_LOG_LEVEL: 'debug'
+CONTAINERD_DEPLOY_PATH: 'cri-containerd-staging/containerd/release-1.5'
+CONTAINERD_PKG_PREFIX: 'containerd-cni'
+
+CONTAINERD_EXTRA_RUNTIME_HANDLER: 'test-handler'
+CONTAINERD_EXTRA_RUNTIME_OPTIONS: |
+  BinaryName = "/home/containerd/usr/local/sbin/runc"
diff --git a/jobs/e2e_node/containerd/containerd-release-1.5/image-config.yaml b/jobs/e2e_node/containerd/containerd-release-1.5/image-config.yaml
@@ -0,0 +1,9 @@
+images:
+  ubuntu:
+    image: ubuntu-gke-1804-1-17-v20200729 # docker 19.03.2 / containerd 1.2.10
+    project: ubuntu-os-gke-cloud
+    metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.5/env"
+  cos-stable:
+    image_family: cos-85-lts
+    project: cos-cloud
+    metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-extra-init-sh</go/src/github.com/containerd/cri/test/e2e_node/gci-init.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.5/env,gci-update-strategy=update_disabled"