Skip to content

Commit b7fdd54

Browse files
authored
Merge pull request kubernetes#35184 from pohly/dra-kubelet-skew-filter
DRA: focus on kubelet tests in kubelet version skew tests
2 parents 31ecdfb + b09e8ce commit b7fdd54

File tree

4 files changed

+42
-0
lines changed

4 files changed

+42
-0
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,12 @@ presubmits:
352352
# including all unsupportd kubelet versions in a deny list.
353353
kubelet_label_filter=" && ! KubeletMinVersion: containsAny { $( for v in $(seq $((previous_minor + 1)) $((minor - 1))); do echo "1.$v, "; done)1.$minor }"
354354

355+
# Running tests which only cover control plane behavior are not useful
356+
# in a kubelet version skew job. We can filter them out by including
357+
# only tests which have the DynamicResourceAllocation feature because
358+
# only those cover kubelet behavior.
359+
kubelet_label_filter+=" && Feature: contains DynamicResourceAllocation"
360+
355361
KUBECONFIG=${HOME}/.kube/config ${ginkgo} run --nodes=8 --timeout=24h --silence-skips --force-newlines --no-color --label-filter="DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation }$kubelet_label_filter && !Alpha && !Flaky && !Slow" ${e2e_test} -- -provider=local -report-dir="${ARTIFACTS}" -report-complete-ginkgo -report-complete-junit &
356362
GINKGO_E2E_PID=$!
357363
wait "${GINKGO_E2E_PID}"
@@ -459,6 +465,12 @@ presubmits:
459465
# including all unsupportd kubelet versions in a deny list.
460466
kubelet_label_filter=" && ! KubeletMinVersion: containsAny { $( for v in $(seq $((previous_minor + 1)) $((minor - 1))); do echo "1.$v, "; done)1.$minor }"
461467

468+
# Running tests which only cover control plane behavior are not useful
469+
# in a kubelet version skew job. We can filter them out by including
470+
# only tests which have the DynamicResourceAllocation feature because
471+
# only those cover kubelet behavior.
472+
kubelet_label_filter+=" && Feature: contains DynamicResourceAllocation"
473+
462474
KUBECONFIG=${HOME}/.kube/config ${ginkgo} run --nodes=8 --timeout=24h --silence-skips --force-newlines --no-color --label-filter="DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation }$kubelet_label_filter && !Alpha && !Flaky && !Slow" ${e2e_test} -- -provider=local -report-dir="${ARTIFACTS}" -report-complete-ginkgo -report-complete-junit &
463475
GINKGO_E2E_PID=$!
464476
wait "${GINKGO_E2E_PID}"

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,12 @@ periodics:
272272
# including all unsupportd kubelet versions in a deny list.
273273
kubelet_label_filter=" && ! KubeletMinVersion: containsAny { $( for v in $(seq $((previous_minor + 1)) $((minor - 1))); do echo "1.$v, "; done)1.$minor }"
274274

275+
# Running tests which only cover control plane behavior are not useful
276+
# in a kubelet version skew job. We can filter them out by including
277+
# only tests which have the DynamicResourceAllocation feature because
278+
# only those cover kubelet behavior.
279+
kubelet_label_filter+=" && Feature: contains DynamicResourceAllocation"
280+
275281
KUBECONFIG=${HOME}/.kube/config ${ginkgo} run --nodes=8 --timeout=24h --silence-skips --force-newlines --no-color --label-filter="DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation }$kubelet_label_filter && !Alpha && !Flaky" ${e2e_test} -- -provider=local -report-dir="${ARTIFACTS}" -report-complete-ginkgo -report-complete-junit &
276282
GINKGO_E2E_PID=$!
277283
wait "${GINKGO_E2E_PID}"
@@ -383,6 +389,12 @@ periodics:
383389
# including all unsupportd kubelet versions in a deny list.
384390
kubelet_label_filter=" && ! KubeletMinVersion: containsAny { $( for v in $(seq $((previous_minor + 1)) $((minor - 1))); do echo "1.$v, "; done)1.$minor }"
385391

392+
# Running tests which only cover control plane behavior are not useful
393+
# in a kubelet version skew job. We can filter them out by including
394+
# only tests which have the DynamicResourceAllocation feature because
395+
# only those cover kubelet behavior.
396+
kubelet_label_filter+=" && Feature: contains DynamicResourceAllocation"
397+
386398
KUBECONFIG=${HOME}/.kube/config ${ginkgo} run --nodes=8 --timeout=24h --silence-skips --force-newlines --no-color --label-filter="DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation }$kubelet_label_filter && !Alpha && !Flaky" ${e2e_test} -- -provider=local -report-dir="${ARTIFACTS}" -report-complete-ginkgo -report-complete-junit &
387399
GINKGO_E2E_PID=$!
388400
wait "${GINKGO_E2E_PID}"

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,12 @@ presubmits:
359359
# including all unsupportd kubelet versions in a deny list.
360360
kubelet_label_filter=" && ! KubeletMinVersion: containsAny { $( for v in $(seq $((previous_minor + 1)) $((minor - 1))); do echo "1.$v, "; done)1.$minor }"
361361

362+
# Running tests which only cover control plane behavior are not useful
363+
# in a kubelet version skew job. We can filter them out by including
364+
# only tests which have the DynamicResourceAllocation feature because
365+
# only those cover kubelet behavior.
366+
kubelet_label_filter+=" && Feature: contains DynamicResourceAllocation"
367+
362368
KUBECONFIG=${HOME}/.kube/config ${ginkgo} run --nodes=8 --timeout=24h --silence-skips --force-newlines --no-color --label-filter="DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation }$kubelet_label_filter && !Alpha && !Flaky && !Slow" ${e2e_test} -- -provider=local -report-dir="${ARTIFACTS}" -report-complete-ginkgo -report-complete-junit &
363369
GINKGO_E2E_PID=$!
364370
wait "${GINKGO_E2E_PID}"
@@ -468,6 +474,12 @@ presubmits:
468474
# including all unsupportd kubelet versions in a deny list.
469475
kubelet_label_filter=" && ! KubeletMinVersion: containsAny { $( for v in $(seq $((previous_minor + 1)) $((minor - 1))); do echo "1.$v, "; done)1.$minor }"
470476

477+
# Running tests which only cover control plane behavior are not useful
478+
# in a kubelet version skew job. We can filter them out by including
479+
# only tests which have the DynamicResourceAllocation feature because
480+
# only those cover kubelet behavior.
481+
kubelet_label_filter+=" && Feature: contains DynamicResourceAllocation"
482+
471483
KUBECONFIG=${HOME}/.kube/config ${ginkgo} run --nodes=8 --timeout=24h --silence-skips --force-newlines --no-color --label-filter="DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation }$kubelet_label_filter && !Alpha && !Flaky && !Slow" ${e2e_test} -- -provider=local -report-dir="${ARTIFACTS}" -report-complete-ginkgo -report-complete-junit &
472484
GINKGO_E2E_PID=$!
473485
wait "${GINKGO_E2E_PID}"

config/jobs/kubernetes/sig-node/dra.jinja

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,12 @@ presubmits:
230230
# generating `! KubeletMinVersion: containsAny { 1.33, 1.34 }`, i.e.
231231
# including all unsupportd kubelet versions in a deny list.
232232
kubelet_label_filter=" && ! KubeletMinVersion: containsAny { $( for v in $(seq $((previous_minor + 1)) $((minor - 1))); do echo "1.$v, "; done)1.$minor }"
233+
234+
# Running tests which only cover control plane behavior are not useful
235+
# in a kubelet version skew job. We can filter them out by including
236+
# only tests which have the DynamicResourceAllocation feature because
237+
# only those cover kubelet behavior.
238+
kubelet_label_filter+=" && Feature: contains DynamicResourceAllocation"
233239
{%- endif %}
234240

235241
KUBECONFIG=${HOME}/.kube/config ${ginkgo} run --nodes=8 --timeout=24h --silence-skips --force-newlines --no-color --label-filter="DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation } {%- if kubelet_skew|int > 0 %}$kubelet_label_filter{%- endif %} {%- if not all_features %} && !Alpha {%- endif %} && !Flaky {%- if not ci and not allow_slow %} && !Slow {%- endif %}" ${e2e_test} -- -provider=local -report-dir="${ARTIFACTS}" -report-complete-ginkgo -report-complete-junit &

0 commit comments

Comments
 (0)