Skip to content

Commit 6719a83

Browse files
authored
Merge pull request #35186 from pohly/dra-kubelet-skew-filter
DRA: focus on kubelet tests in kubelet version skew tests, II
2 parents 9714443 + 4e9b709 commit 6719a83

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ presubmits:
356356
# in a kubelet version skew job. We can filter them out by including
357357
# only tests which have the DynamicResourceAllocation feature because
358358
# only those cover kubelet behavior.
359-
kubelet_label_filter+=" && Feature: contains DynamicResourceAllocation"
359+
kubelet_label_filter+=" && Feature: containsAny DynamicResourceAllocation"
360360
361361
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 &
362362
GINKGO_E2E_PID=$!
@@ -469,7 +469,7 @@ presubmits:
469469
# in a kubelet version skew job. We can filter them out by including
470470
# only tests which have the DynamicResourceAllocation feature because
471471
# only those cover kubelet behavior.
472-
kubelet_label_filter+=" && Feature: contains DynamicResourceAllocation"
472+
kubelet_label_filter+=" && Feature: containsAny DynamicResourceAllocation"
473473
474474
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 &
475475
GINKGO_E2E_PID=$!

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ periodics:
276276
# in a kubelet version skew job. We can filter them out by including
277277
# only tests which have the DynamicResourceAllocation feature because
278278
# only those cover kubelet behavior.
279-
kubelet_label_filter+=" && Feature: contains DynamicResourceAllocation"
279+
kubelet_label_filter+=" && Feature: containsAny DynamicResourceAllocation"
280280
281281
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 &
282282
GINKGO_E2E_PID=$!
@@ -393,7 +393,7 @@ periodics:
393393
# in a kubelet version skew job. We can filter them out by including
394394
# only tests which have the DynamicResourceAllocation feature because
395395
# only those cover kubelet behavior.
396-
kubelet_label_filter+=" && Feature: contains DynamicResourceAllocation"
396+
kubelet_label_filter+=" && Feature: containsAny DynamicResourceAllocation"
397397
398398
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 &
399399
GINKGO_E2E_PID=$!

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ presubmits:
363363
# in a kubelet version skew job. We can filter them out by including
364364
# only tests which have the DynamicResourceAllocation feature because
365365
# only those cover kubelet behavior.
366-
kubelet_label_filter+=" && Feature: contains DynamicResourceAllocation"
366+
kubelet_label_filter+=" && Feature: containsAny DynamicResourceAllocation"
367367
368368
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 &
369369
GINKGO_E2E_PID=$!
@@ -478,7 +478,7 @@ presubmits:
478478
# in a kubelet version skew job. We can filter them out by including
479479
# only tests which have the DynamicResourceAllocation feature because
480480
# only those cover kubelet behavior.
481-
kubelet_label_filter+=" && Feature: contains DynamicResourceAllocation"
481+
kubelet_label_filter+=" && Feature: containsAny DynamicResourceAllocation"
482482
483483
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 &
484484
GINKGO_E2E_PID=$!

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ presubmits:
235235
# in a kubelet version skew job. We can filter them out by including
236236
# only tests which have the DynamicResourceAllocation feature because
237237
# only those cover kubelet behavior.
238-
kubelet_label_filter+=" && Feature: contains DynamicResourceAllocation"
238+
kubelet_label_filter+=" && Feature: containsAny DynamicResourceAllocation"
239239
{%- endif %}
240240

241241
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)