Skip to content

Commit d74f26a

Browse files
committed
DRA E2E node: test primarily with containerd 2.0
Several reasons: - Testing primarily with cgroup v1 doesn't make sense, it's not recommended anymore. - containerd jobs seem to be slightly faster. - crio image config updates caused job failures a few times.
1 parent 9dc89bf commit d74f26a

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

config/jobs/kubernetes/sig-node/dra-presubmit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,6 @@ presubmits:
710710
skip_branches:
711711
- release-\d+\.\d+ # per-release image
712712
always_run: false
713-
run_if_changed: (/dra/|/dynamicresources/|/resourceclaim/|/deviceclass/|/resourceslice/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_).*\.(go|yaml)
714713
optional: true
715714
skip_report: false
716715
labels:
@@ -875,6 +874,7 @@ presubmits:
875874
skip_branches:
876875
- release-\d+\.\d+ # per-release image
877876
always_run: false
877+
run_if_changed: (/dra/|/dynamicresources/|/resourceclaim/|/deviceclass/|/resourceslice/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_).*\.(go|yaml)
878878
optional: true
879879
skip_report: false
880880
labels:

config/jobs/kubernetes/sig-node/dra.generate.conf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ need_test_infra_repo = true
112112
description = Runs E2E node tests for Dynamic Resource Allocation on-by-default features with CRI-O using cgroup v1
113113
image_config_file = /home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv1.yaml
114114
inject_ssh_public_key = true
115-
# Automatically testing with one container runtime in one configuration is sufficient to detect basic problems in kubelet early.
116-
# CRI-O was picked because it was solid for testing so far.
117-
run_if_changed = (/dra/|/dynamicresources/|/resourceclaim/|/deviceclass/|/resourceslice/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_).*\.(go|yaml)
118115
release_informing = true
119116

120117
# This job is the same as ci-node-e2e-cgrpv1-crio-dra, but for cgroup v2
@@ -145,3 +142,7 @@ need_containerd_20_repo = true
145142
description = Runs E2E node tests for Dynamic Resource Allocation on-by-default features with containerd 2.0
146143
image_config_file = /home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-release-2.0/image-config.yaml
147144
release_informing = true
145+
# Automatically testing with one container runtime in one configuration is sufficient to detect basic problems in kubelet early.
146+
# We switched from CRI-O to containerd because the job seemed to finish a bit sooner and there were failures caused by
147+
# crio image config changes.
148+
run_if_changed = (/dra/|/dynamicresources/|/resourceclaim/|/deviceclass/|/resourceslice/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_).*\.(go|yaml)

0 commit comments

Comments
 (0)