From 662e2f18a4ea95aba16e779e4f154ed4aed03232 Mon Sep 17 00:00:00 2001
From: Camryn Lee <camrynlee@microsoft.com>
Date: Wed, 26 Mar 2025 18:45:54 +0000
Subject: [PATCH 1/2] ci: skip new test for k8s 1.32 kubectl portforward
 shutdown

---
 .../cni/k8s-e2e/k8s-e2e-job-template.yaml     | 203 ++++++++--------
 .pipelines/cni/k8s-e2e/k8s-e2e.jobs.yaml      | 218 +++++++++---------
 2 files changed, 209 insertions(+), 212 deletions(-)

diff --git a/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml b/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml
index 72c9092d76..c0c2a3d260 100644
--- a/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml
+++ b/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml
@@ -5,7 +5,6 @@ parameters:
   sub: ""
   cni: cni
 
-
 jobs:
   - job: CNI_${{ parameters.os }}
     condition: and( not(canceled()), not(failed()) )
@@ -36,109 +35,109 @@ jobs:
 
         displayName: "Setup Environment"
       - ${{ if contains(parameters.os, 'windows') }}:
-        - script: |
-            set -e
-            kubectl apply -f test/integration/manifests/load/privileged-daemonset-windows.yaml
-            kubectl rollout status -n kube-system ds privileged-daemonset
+          - script: |
+              set -e
+              kubectl apply -f test/integration/manifests/load/privileged-daemonset-windows.yaml
+              kubectl rollout status -n kube-system ds privileged-daemonset
 
-            kubectl get pod -n kube-system -l app=privileged-daemonset,os=windows -owide
-            pods=`kubectl get pod -n kube-system -l app=privileged-daemonset,os=windows --no-headers | awk '{print $1}'`
-            for pod in $pods; do
-              kubectl exec -i -n kube-system $pod -- powershell "Restart-Service kubeproxy"
-              kubectl exec -i -n kube-system $pod -- powershell "Get-Service kubeproxy"
-            done
-          name: kubeproxy
-          displayName: Restart Kubeproxy on Windows nodes
-          retryCountOnTaskFailure: 3
+              kubectl get pod -n kube-system -l app=privileged-daemonset,os=windows -owide
+              pods=`kubectl get pod -n kube-system -l app=privileged-daemonset,os=windows --no-headers | awk '{print $1}'`
+              for pod in $pods; do
+                kubectl exec -i -n kube-system $pod -- powershell "Restart-Service kubeproxy"
+                kubectl exec -i -n kube-system $pod -- powershell "Get-Service kubeproxy"
+              done
+            name: kubeproxy
+            displayName: Restart Kubeproxy on Windows nodes
+            retryCountOnTaskFailure: 3
       - ${{ if eq(parameters.datapath, true) }}:
-        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
-          parameters:
-            testName: Datapath
-            name: datapath
-            ginkgoFocus: '(.*).Networking.should|(.*).Networking.Granular|(.*)kubernetes.api'
-            ginkgoSkip: 'SCTP|Disruptive|Slow|hostNetwork|kube-proxy|IPv6'
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 10
+          - template: ../k8s-e2e/k8s-e2e-step-template.yaml
+            parameters:
+              testName: Datapath
+              name: datapath
+              ginkgoFocus: "(.*).Networking.should|(.*).Networking.Granular|(.*)kubernetes.api"
+              ginkgoSkip: "SCTP|Disruptive|Slow|hostNetwork|kube-proxy|IPv6"
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 10
       - ${{ if eq(parameters.dns, true) }}:
-        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
-          parameters:
-            testName: DNS
-            name: dns
-            ginkgoFocus: '\[sig-network\].DNS.should'
-            ginkgoSkip: 'resolv|256 search'
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 3
+          - template: ../k8s-e2e/k8s-e2e-step-template.yaml
+            parameters:
+              testName: DNS
+              name: dns
+              ginkgoFocus: '\[sig-network\].DNS.should'
+              ginkgoSkip: "resolv|256 search"
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 3
       - ${{ if eq(parameters.portforward, true) }}:
-        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
-          parameters:
-            testName: Kubectl Portforward
-            name: portforward
-            ginkgoFocus: '\[sig-cli\].Kubectl.Port'
-            ginkgoSkip: ''
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 3
-      - ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cni') ) }}:
-        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
-          parameters:
-            testName: Service Conformance
-            name: service
-            ginkgoFocus: 'Services.*\[Conformance\].*'
-            ginkgoSkip: ''
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 3
-      - ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cilium') ) }}:
-        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
-          parameters:
-            testName: Service Conformance|Cilium
-            name: service
-            ginkgoFocus: 'Services.*\[Conformance\].*'
-            ginkgoSkip: '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
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 3
+          - template: ../k8s-e2e/k8s-e2e-step-template.yaml
+            parameters:
+              testName: Kubectl Portforward
+              name: portforward
+              ginkgoFocus: '\[sig-cli\].Kubectl.Port'
+              ginkgoSkip: "port-forward should keep working after detect broken connection" # affecting k8s 1.32 https://github.com/kubernetes/kubernetes/issues/129803. Note: retry this test in 1.33 with timeout extended
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 3
+      - ? ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cni') ) }}
+        : - template: ../k8s-e2e/k8s-e2e-step-template.yaml
+            parameters:
+              testName: Service Conformance
+              name: service
+              ginkgoFocus: 'Services.*\[Conformance\].*'
+              ginkgoSkip: ""
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 3
+      - ? ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cilium') ) }}
+        : - template: ../k8s-e2e/k8s-e2e-step-template.yaml
+            parameters:
+              testName: Service Conformance|Cilium
+              name: service
+              ginkgoFocus: 'Services.*\[Conformance\].*'
+              ginkgoSkip: "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
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 3
       - ${{ if eq(parameters.hostport, true) }}:
-        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
-          parameters:
-            testName: Host Port
-            name: hostport
-            ginkgoFocus: '\[sig-network\](.*)HostPort|\[sig-scheduling\](.*)hostPort'
-            ginkgoSkip: 'SCTP|exists conflict' # Skip slow 5 minute test
-            os: ${{ parameters.os }}
-            processes: 1 # Has a short serial test
-            attempts: 3
-      - ${{ if and(eq(parameters.hybridWin, true), eq(parameters.os, 'windows')) }}:
-        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
-          parameters:
-            testName: Hybrid Network
-            name: hybrid
-            ginkgoFocus: '\[sig-windows\].Hybrid'
-            ginkgoSkip: ''
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 3
-      - ${{ if and( eq(parameters.dualstack, true), eq(contains(parameters.cni, 'cilium'), false) ) }}:
-        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
-          parameters:
-            testName: DualStack Test
-            name: DualStack
-            clusterName: ${{ parameters.clusterName }}
-            ginkgoFocus: '\[Feature:IPv6DualStack\]'
-            ginkgoSkip: 'SCTP|session affinity'
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 3
-      - ${{ if and( eq(parameters.dualstack, true), contains(parameters.cni, 'cilium') ) }}:
-        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
-          parameters:
-            testName: DualStack Test|Cilium
-            name: DualStack
-            clusterName: ${{ parameters.clusterName }}
-            ginkgoFocus: '\[Feature:IPv6DualStack\]'
-            ginkgoSkip: 'SCTP|session affinity|should function for service endpoints using hostNetwork' # Cilium dualstack has a known issue with this test https://github.com/cilium/cilium/issues/25135
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 3
+          - template: ../k8s-e2e/k8s-e2e-step-template.yaml
+            parameters:
+              testName: Host Port
+              name: hostport
+              ginkgoFocus: '\[sig-network\](.*)HostPort|\[sig-scheduling\](.*)hostPort'
+              ginkgoSkip: "SCTP|exists conflict" # Skip slow 5 minute test
+              os: ${{ parameters.os }}
+              processes: 1 # Has a short serial test
+              attempts: 3
+      - ? ${{ if and(eq(parameters.hybridWin, true), eq(parameters.os, 'windows')) }}
+        : - template: ../k8s-e2e/k8s-e2e-step-template.yaml
+            parameters:
+              testName: Hybrid Network
+              name: hybrid
+              ginkgoFocus: '\[sig-windows\].Hybrid'
+              ginkgoSkip: ""
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 3
+      - ? ${{ if and( eq(parameters.dualstack, true), eq(contains(parameters.cni, 'cilium'), false) ) }}
+        : - template: ../k8s-e2e/k8s-e2e-step-template.yaml
+            parameters:
+              testName: DualStack Test
+              name: DualStack
+              clusterName: ${{ parameters.clusterName }}
+              ginkgoFocus: '\[Feature:IPv6DualStack\]'
+              ginkgoSkip: "SCTP|session affinity"
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 3
+      - ? ${{ if and( eq(parameters.dualstack, true), contains(parameters.cni, 'cilium') ) }}
+        : - template: ../k8s-e2e/k8s-e2e-step-template.yaml
+            parameters:
+              testName: DualStack Test|Cilium
+              name: DualStack
+              clusterName: ${{ parameters.clusterName }}
+              ginkgoFocus: '\[Feature:IPv6DualStack\]'
+              ginkgoSkip: "SCTP|session affinity|should function for service endpoints using hostNetwork" # Cilium dualstack has a known issue with this test https://github.com/cilium/cilium/issues/25135
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 3
diff --git a/.pipelines/cni/k8s-e2e/k8s-e2e.jobs.yaml b/.pipelines/cni/k8s-e2e/k8s-e2e.jobs.yaml
index 158685826f..ae15d96d1a 100644
--- a/.pipelines/cni/k8s-e2e/k8s-e2e.jobs.yaml
+++ b/.pipelines/cni/k8s-e2e/k8s-e2e.jobs.yaml
@@ -5,7 +5,6 @@ parameters:
   sub: ""
   cni: cni
 
-
 jobs:
   - job: CNI_${{ parameters.os }}
     condition: and( not(canceled()), not(failed()) )
@@ -46,120 +45,119 @@ jobs:
         retryCountOnTaskFailure: 5
 
       - ${{ if contains(parameters.os, 'windows') }}:
-        - script: |
-            set -e
-            kubectl apply -f test/integration/manifests/load/privileged-daemonset-windows.yaml
-            kubectl rollout status -n kube-system ds privileged-daemonset
-
-            kubectl get pod -n kube-system -l app=privileged-daemonset,os=windows -owide
-            pods=`kubectl get pod -n kube-system -l app=privileged-daemonset,os=windows --no-headers | awk '{print $1}'`
-            for pod in $pods; do
-              kubectl exec -i -n kube-system $pod -- powershell "Restart-Service kubeproxy"
-              kubectl exec -i -n kube-system $pod -- powershell "Get-Service kubeproxy"
-            done
-          workingDirectory: $(ACN_DIR)
-          name: kubeproxy
-          displayName: Restart Kubeproxy on Windows nodes
-          retryCountOnTaskFailure: 3
+          - script: |
+              set -e
+              kubectl apply -f test/integration/manifests/load/privileged-daemonset-windows.yaml
+              kubectl rollout status -n kube-system ds privileged-daemonset
+
+              kubectl get pod -n kube-system -l app=privileged-daemonset,os=windows -owide
+              pods=`kubectl get pod -n kube-system -l app=privileged-daemonset,os=windows --no-headers | awk '{print $1}'`
+              for pod in $pods; do
+                kubectl exec -i -n kube-system $pod -- powershell "Restart-Service kubeproxy"
+                kubectl exec -i -n kube-system $pod -- powershell "Get-Service kubeproxy"
+              done
+            workingDirectory: $(ACN_DIR)
+            name: kubeproxy
+            displayName: Restart Kubeproxy on Windows nodes
+            retryCountOnTaskFailure: 3
 
       - ${{ if eq(parameters.datapath, true) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
-          parameters:
-            testName: Datapath
-            name: datapath
-            ginkgoFocus: '(.*).Networking.should|(.*).Networking.Granular|(.*)kubernetes.api'
-            ginkgoSkip: 'SCTP|Disruptive|Slow|hostNetwork|kube-proxy|IPv6'
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 10
+          - template: k8s-e2e.steps.yaml@ACNTools
+            parameters:
+              testName: Datapath
+              name: datapath
+              ginkgoFocus: "(.*).Networking.should|(.*).Networking.Granular|(.*)kubernetes.api"
+              ginkgoSkip: "SCTP|Disruptive|Slow|hostNetwork|kube-proxy|IPv6"
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 10
 
       - ${{ if eq(parameters.dns, true) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
-          parameters:
-            testName: DNS
-            name: dns
-            ginkgoFocus: '\[sig-network\].DNS.should'
-            ginkgoSkip: 'resolv|256 search'
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 3
+          - template: k8s-e2e.steps.yaml@ACNTools
+            parameters:
+              testName: DNS
+              name: dns
+              ginkgoFocus: '\[sig-network\].DNS.should'
+              ginkgoSkip: "resolv|256 search"
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 3
 
       - ${{ if eq(parameters.portforward, true) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
-          parameters:
-            testName: Kubectl Portforward
-            name: portforward
-            ginkgoFocus: '\[sig-cli\].Kubectl.Port'
-            ginkgoSkip: ''
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 3
-
-      - ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cni') ) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
-          parameters:
-            testName: Service Conformance
-            name: service
-            ginkgoFocus: 'Services.*\[Conformance\].*'
-            ginkgoSkip: ''
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 3
-
-      - ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cilium') ) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
-          parameters:
-            testName: Service Conformance|Cilium
-            name: service
-            ginkgoFocus: 'Services.*\[Conformance\].*'
-            ginkgoSkip: '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
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 3
+          - template: k8s-e2e.steps.yaml@ACNTools
+            parameters:
+              testName: Kubectl Portforward
+              name: portforward
+              ginkgoFocus: '\[sig-cli\].Kubectl.Port'
+              ginkgoSkip: "port-forward should keep working after detect broken connection" # affecting k8s 1.32 https://github.com/kubernetes/kubernetes/issues/129803. Note: retry this test in 1.33 with timeout extended
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 3
+
+      - ? ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cni') ) }}
+        : - template: k8s-e2e.steps.yaml@ACNTools
+            parameters:
+              testName: Service Conformance
+              name: service
+              ginkgoFocus: 'Services.*\[Conformance\].*'
+              ginkgoSkip: ""
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 3
+
+      - ? ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cilium') ) }}
+        : - template: k8s-e2e.steps.yaml@ACNTools
+            parameters:
+              testName: Service Conformance|Cilium
+              name: service
+              ginkgoFocus: 'Services.*\[Conformance\].*'
+              ginkgoSkip: "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
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 3
 
       - ${{ if eq(parameters.hostport, true) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
-          parameters:
-            testName: Host Port
-            name: hostport
-            ginkgoFocus: '\[sig-network\](.*)HostPort|\[sig-scheduling\](.*)hostPort'
-            ginkgoSkip: 'SCTP|exists conflict' # Skip slow 5 minute test
-            os: ${{ parameters.os }}
-            processes: 1 # Has a short serial test
-            attempts: 3
-
-      - ${{ if and(eq(parameters.hybridWin, true), eq(parameters.os, 'windows')) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
-          parameters:
-            testName: Hybrid Network
-            name: hybrid
-            ginkgoFocus: '\[sig-windows\].Hybrid'
-            ginkgoSkip: ''
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 3
-
-      - ${{ if and( eq(parameters.dualstack, true), eq(contains(parameters.cni, 'cilium'), false) ) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
-          parameters:
-            testName: DualStack Test
-            name: DualStack
-            clusterName: ${{ parameters.clusterName }}
-            ginkgoFocus: '\[Feature:IPv6DualStack\]'
-            ginkgoSkip: 'SCTP|session affinity'
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 3
-
-      - ${{ if and( eq(parameters.dualstack, true), contains(parameters.cni, 'cilium') ) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
-          parameters:
-            testName: DualStack Test|Cilium
-            name: DualStack
-            clusterName: ${{ parameters.clusterName }}
-            ginkgoFocus: '\[Feature:IPv6DualStack\]'
-            ginkgoSkip: 'SCTP|session affinity|should function for service endpoints using hostNetwork' # Cilium dualstack has a known issue with this test https://github.com/cilium/cilium/issues/25135
-            os: ${{ parameters.os }}
-            processes: 8
-            attempts: 3
-
+          - template: k8s-e2e.steps.yaml@ACNTools
+            parameters:
+              testName: Host Port
+              name: hostport
+              ginkgoFocus: '\[sig-network\](.*)HostPort|\[sig-scheduling\](.*)hostPort'
+              ginkgoSkip: "SCTP|exists conflict" # Skip slow 5 minute test
+              os: ${{ parameters.os }}
+              processes: 1 # Has a short serial test
+              attempts: 3
+
+      - ? ${{ if and(eq(parameters.hybridWin, true), eq(parameters.os, 'windows')) }}
+        : - template: k8s-e2e.steps.yaml@ACNTools
+            parameters:
+              testName: Hybrid Network
+              name: hybrid
+              ginkgoFocus: '\[sig-windows\].Hybrid'
+              ginkgoSkip: ""
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 3
+
+      - ? ${{ if and( eq(parameters.dualstack, true), eq(contains(parameters.cni, 'cilium'), false) ) }}
+        : - template: k8s-e2e.steps.yaml@ACNTools
+            parameters:
+              testName: DualStack Test
+              name: DualStack
+              clusterName: ${{ parameters.clusterName }}
+              ginkgoFocus: '\[Feature:IPv6DualStack\]'
+              ginkgoSkip: "SCTP|session affinity"
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 3
+
+      - ? ${{ if and( eq(parameters.dualstack, true), contains(parameters.cni, 'cilium') ) }}
+        : - template: k8s-e2e.steps.yaml@ACNTools
+            parameters:
+              testName: DualStack Test|Cilium
+              name: DualStack
+              clusterName: ${{ parameters.clusterName }}
+              ginkgoFocus: '\[Feature:IPv6DualStack\]'
+              ginkgoSkip: "SCTP|session affinity|should function for service endpoints using hostNetwork" # Cilium dualstack has a known issue with this test https://github.com/cilium/cilium/issues/25135
+              os: ${{ parameters.os }}
+              processes: 8
+              attempts: 3

From 1ceb0ef77d7922d724e43dd61f85daeeabcea44d Mon Sep 17 00:00:00 2001
From: Camryn Lee <camrynlee@microsoft.com>
Date: Fri, 4 Apr 2025 19:07:29 +0000
Subject: [PATCH 2/2] remove formatting

---
 .../cni/k8s-e2e/k8s-e2e-job-template.yaml     | 20 +++++++++----------
 .pipelines/cni/k8s-e2e/k8s-e2e.jobs.yaml      | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml b/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml
index c0c2a3d260..cd292d64a8 100644
--- a/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml
+++ b/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml
@@ -79,8 +79,8 @@ jobs:
               os: ${{ parameters.os }}
               processes: 8
               attempts: 3
-      - ? ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cni') ) }}
-        : - template: ../k8s-e2e/k8s-e2e-step-template.yaml
+      - ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cni') ) }}:
+          - template: ../k8s-e2e/k8s-e2e-step-template.yaml
             parameters:
               testName: Service Conformance
               name: service
@@ -89,8 +89,8 @@ jobs:
               os: ${{ parameters.os }}
               processes: 8
               attempts: 3
-      - ? ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cilium') ) }}
-        : - template: ../k8s-e2e/k8s-e2e-step-template.yaml
+      - ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cilium') ) }}:
+          - template: ../k8s-e2e/k8s-e2e-step-template.yaml
             parameters:
               testName: Service Conformance|Cilium
               name: service
@@ -109,8 +109,8 @@ jobs:
               os: ${{ parameters.os }}
               processes: 1 # Has a short serial test
               attempts: 3
-      - ? ${{ if and(eq(parameters.hybridWin, true), eq(parameters.os, 'windows')) }}
-        : - template: ../k8s-e2e/k8s-e2e-step-template.yaml
+      - ${{ if and(eq(parameters.hybridWin, true), eq(parameters.os, 'windows')) }}:
+          - template: ../k8s-e2e/k8s-e2e-step-template.yaml
             parameters:
               testName: Hybrid Network
               name: hybrid
@@ -119,8 +119,8 @@ jobs:
               os: ${{ parameters.os }}
               processes: 8
               attempts: 3
-      - ? ${{ if and( eq(parameters.dualstack, true), eq(contains(parameters.cni, 'cilium'), false) ) }}
-        : - template: ../k8s-e2e/k8s-e2e-step-template.yaml
+      - ${{ if and( eq(parameters.dualstack, true), eq(contains(parameters.cni, 'cilium'), false) ) }}:
+          - template: ../k8s-e2e/k8s-e2e-step-template.yaml
             parameters:
               testName: DualStack Test
               name: DualStack
@@ -130,8 +130,8 @@ jobs:
               os: ${{ parameters.os }}
               processes: 8
               attempts: 3
-      - ? ${{ if and( eq(parameters.dualstack, true), contains(parameters.cni, 'cilium') ) }}
-        : - template: ../k8s-e2e/k8s-e2e-step-template.yaml
+      - ${{ if and( eq(parameters.dualstack, true), contains(parameters.cni, 'cilium') ) }}:
+          - template: ../k8s-e2e/k8s-e2e-step-template.yaml
             parameters:
               testName: DualStack Test|Cilium
               name: DualStack
diff --git a/.pipelines/cni/k8s-e2e/k8s-e2e.jobs.yaml b/.pipelines/cni/k8s-e2e/k8s-e2e.jobs.yaml
index ae15d96d1a..5a0336f12b 100644
--- a/.pipelines/cni/k8s-e2e/k8s-e2e.jobs.yaml
+++ b/.pipelines/cni/k8s-e2e/k8s-e2e.jobs.yaml
@@ -94,8 +94,8 @@ jobs:
               processes: 8
               attempts: 3
 
-      - ? ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cni') ) }}
-        : - template: k8s-e2e.steps.yaml@ACNTools
+      - ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cni') ) }}:
+          - template: k8s-e2e.steps.yaml@ACNTools
             parameters:
               testName: Service Conformance
               name: service
@@ -105,8 +105,8 @@ jobs:
               processes: 8
               attempts: 3
 
-      - ? ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cilium') ) }}
-        : - template: k8s-e2e.steps.yaml@ACNTools
+      - ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cilium') ) }}:
+          - template: k8s-e2e.steps.yaml@ACNTools
             parameters:
               testName: Service Conformance|Cilium
               name: service
@@ -127,8 +127,8 @@ jobs:
               processes: 1 # Has a short serial test
               attempts: 3
 
-      - ? ${{ if and(eq(parameters.hybridWin, true), eq(parameters.os, 'windows')) }}
-        : - template: k8s-e2e.steps.yaml@ACNTools
+      - ${{ if and(eq(parameters.hybridWin, true), eq(parameters.os, 'windows')) }}:
+          - template: k8s-e2e.steps.yaml@ACNTools
             parameters:
               testName: Hybrid Network
               name: hybrid
@@ -138,8 +138,8 @@ jobs:
               processes: 8
               attempts: 3
 
-      - ? ${{ if and( eq(parameters.dualstack, true), eq(contains(parameters.cni, 'cilium'), false) ) }}
-        : - template: k8s-e2e.steps.yaml@ACNTools
+      - ${{ if and( eq(parameters.dualstack, true), eq(contains(parameters.cni, 'cilium'), false) ) }}:
+          - template: k8s-e2e.steps.yaml@ACNTools
             parameters:
               testName: DualStack Test
               name: DualStack
@@ -150,8 +150,8 @@ jobs:
               processes: 8
               attempts: 3
 
-      - ? ${{ if and( eq(parameters.dualstack, true), contains(parameters.cni, 'cilium') ) }}
-        : - template: k8s-e2e.steps.yaml@ACNTools
+      - ${{ if and( eq(parameters.dualstack, true), contains(parameters.cni, 'cilium') ) }}:
+          - template: k8s-e2e.steps.yaml@ACNTools
             parameters:
               testName: DualStack Test|Cilium
               name: DualStack