backport "fix: skipping the k8s e2e unsupported service conformance t…

…est (#2255)" to release/v1.4 (#2256) fix: skipping the k8s e2e unsupported service conformance test Co-authored-by: Vipul Singh <[email protected]>
Azure · Sep 26, 2023 · c93c3df · c93c3df
1 parent f954e86
commit c93c3df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
@@ -143,7 +143,8 @@ steps:
       export PATH=${PATH}:/usr/local/bin/gsutil
       KUBECONFIG=~/.kube/config kubetest2 noop \
         --test ginkgo -- \
-        --focus-regex "Services.*\[Conformance\].*"
+        --focus-regex "Services.*\[Conformance\].*" \
+        --skip-regex "should serve endpoints on same port and different protocols" # Cilium does not support this feature. For more info on test: https://github.com/kubernetes/kubernetes/blame/e602e9e03cd744c23dde9fee09396812dd7bdd93/test/conformance/testdata/conformance.yaml#L1780-L1788
     name: "servicesConformance"
     displayName: "Run Services Conformance Tests"
 

diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
@@ -127,7 +127,8 @@ steps:
       export PATH=${PATH}:/usr/local/bin/gsutil
       KUBECONFIG=~/.kube/config kubetest2 noop \
         --test ginkgo -- \
-        --focus-regex "Services.*\[Conformance\].*"
+        --focus-regex "Services.*\[Conformance\].*" \
+        --skip-regex "should serve endpoints on same port and different protocols" # Cilium does not support this feature. For more info on test: https://github.com/kubernetes/kubernetes/blame/e602e9e03cd744c23dde9fee09396812dd7bdd93/test/conformance/testdata/conformance.yaml#L1780-L1788
     name: "servicesConformance"
     displayName: "Run Services Conformance Tests"