Skip to content

Commit 04c69d8

Browse files
authored
Merge pull request #35131 from elieser1101/update-resource-managers-label-filters
use contains any label-filter to match only reosurce manager tests
2 parents 282a410 + 70e4663 commit 04c69d8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

config/jobs/kubernetes/sig-node/crio.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ periodics:
889889
- --repo-root=.
890890
- --gcp-zone=us-central1-b
891891
- --parallelism=1
892-
- '--label-filter=Feature: isSubsetOf { CPUManager, MemoryManager, TopologyManager }'
892+
- '--label-filter=Feature: containsAny { CPUManager, MemoryManager, TopologyManager } && Feature: isSubsetOf { CPUManager, MemoryManager, TopologyManager }'
893893
- '--test-args=--container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--fail-cgroupv1=true --cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
894894
- --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv2-resource-managers.yaml
895895
- --timeout=120m

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2067,7 +2067,7 @@ presubmits:
20672067
- --repo-root=.
20682068
- --gcp-zone=us-central1-b
20692069
- --parallelism=1
2070-
- '--label-filter=Feature: isSubsetOf { CPUManager, MemoryManager, TopologyManager }'
2070+
- '--label-filter=Feature: containsAny { CPUManager, MemoryManager, TopologyManager } && Feature: isSubsetOf { CPUManager, MemoryManager, TopologyManager }'
20712071
- '--test-args=--container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
20722072
- --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv1-resource-managers.yaml
20732073
- --timeout=120m
@@ -2127,7 +2127,7 @@ presubmits:
21272127
- --repo-root=.
21282128
- --gcp-zone=us-central1-b
21292129
- --parallelism=1
2130-
- '--label-filter=Feature: isSubsetOf { CPUManager, MemoryManager, TopologyManager }'
2130+
- '--label-filter=Feature: containsAny { CPUManager, MemoryManager, TopologyManager } && Feature: isSubsetOf { CPUManager, MemoryManager, TopologyManager }'
21312131
- '--test-args=--container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--fail-cgroupv1=true --cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
21322132
- --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv2-resource-managers.yaml
21332133
- --timeout=120m

0 commit comments

Comments
 (0)