Skip to content

Commit

Permalink
ci: separarte pull-containerd-node-e2e for 1.5 branch
Browse files Browse the repository at this point in the history
containerd v1.5.x supports CRI v1alpha2, the API that was available at
the time of release for containerd v1.5. containerd v1.6.x has support
for both CRI v1alpha2 and v1; and is being designated a long term
support release.

kubelet master is removing support for CRI v1alpha2, this action has the
effect of forcing kubernetes master(and kubernetes r.next+) users to move
up to containerd v1.6.x where both CRI v1 and v1alpha2 is supported.

Therefore we need to separate out the pull-containerd-node-e2e job for
containerd 1.5 branch, so that patches can still be made to 1.5 branch
till its EOL. Instead of running against kubernetes master, it will run
against k8s release-1.25 branch (the last release which supports CRI v1alpha2)

Ref: kubernetes/kubernetes#110618

Signed-off-by: Akhil Mohan <makhil@vmware.com>
  • Loading branch information
akhilerm committed Nov 8, 2022
1 parent 8a033d1 commit 935fa77
Showing 1 changed file with 51 additions and 1 deletion.
52 changes: 51 additions & 1 deletion config/jobs/containerd/containerd/containerd-presubmit-jobs.yaml
Expand Up @@ -31,7 +31,6 @@ presubmits:
decorate: true
branches:
- main
- release/1.5
- release/1.6
decoration_config:
timeout: 100m
Expand Down Expand Up @@ -78,6 +77,57 @@ presubmits:
--timeout=65m
"--node-args=--image-config-file=${GOPATH}/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main-presubmit/image-config-presubmit.yaml -node-env=PULL_REFS=$(PULL_REFS)"
- name: pull-containerd-release-1.5-node-e2e
always_run: true
max_concurrency: 8
decorate: true
branches:
- release/1.5
decoration_config:
timeout: 100m
extra_refs:
- org: kubernetes
repo: kubernetes
base_ref: release-1.25
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
testgrid-tab-name: pull-containerd-release-1.5-node-e2e
description: run node e2e tests
labels:
preset-service-account: "true"
preset-k8s-ssh: "true"
spec:
containers:
- name: pull-containerd-node-e2e
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20221024-d0c013ee2d-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-project=cri-c8d-pr-node-e2e
--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" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"'
--node-tests=true
--provider=gce
'--test_args=--nodes=8 --focus="\[NodeConformance\]|\[NodeFeature:.+\]|\[NodeFeature\]" --skip="\[Flaky\]|\[Slow\]|\[Serial\]"'
--timeout=65m
"--node-args=--image-config-file=${GOPATH}/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main-presubmit/image-config-presubmit.yaml -node-env=PULL_REFS=$(PULL_REFS)"
- name: pull-containerd-sandboxed-node-e2e
always_run: false
max_concurrency: 8
Expand Down

0 comments on commit 935fa77

Please sign in to comment.