Merge pull request #33440 from aojea/ginkgo_filter_network

test migration from ginkgo regexes to ginkgo labels
kubernetes · Sep 8, 2024 · ba30036 · ba30036
2 parents 34588ef + 00909b0
commit ba30036
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/config/jobs/kubernetes/sig-network/sig-network-kind.yaml b/config/jobs/kubernetes/sig-network/sig-network-kind.yaml
@@ -24,8 +24,8 @@ presubmits:
         env:
         - name: BUILD_TYPE
           value: docker
-        - name: FOCUS
-          value: \[Conformance\]|DualStack
+        - name: LABEL_FILTER
+          value: "(Conformance || sig-network ) && Feature: isSubsetOf IPv6DualStack  && !Feature: containsAny {Alpha, Beta} && !Disruptive && !Flaky"
         - name: PARALLEL
           value: "true"
         # enable IPV6 in bootstrap image
@@ -192,12 +192,10 @@ presubmits:
         env:
         - name: PARALLEL
           value: "true"
-        - name: FOCUS
-          value: \[sig-network\]|\[Conformance\]
         - name: KUBE_PROXY_MODE
           value: "nftables"
-        - name: SKIP
-          value: \[Feature:(Networking-IPv6|Example|Federation|PerformanceDNS|ServiceCIDRs)\]|LB.health.check|LoadBalancer|load.balancer|GCE|NetworkPolicy|DualStack
+        - name: LABEL_FILTER
+          value: "(Conformance || sig-network ) && !Feature: containsAny {Alpha, Beta, Networking-IPv6, Example, Federation, PerformanceDNS, LoadBalancer} && !Disruptive && !Flaky"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true