From 11d6c8247e69040e94bbce3da61f5b4934e7d30f Mon Sep 17 00:00:00 2001
From: jpayne3506 <payne.3506@gmail.com>
Date: Tue, 6 Aug 2024 17:10:31 -0700
Subject: [PATCH 1/6] ci: add node restart to cniv2 E2E

---
 .../aks-swift/e2e-job-template.yaml           |  2 +
 .../aks-swift/e2e-step-template.yaml          | 36 +++++++++
 .../azure-cni-overlay-e2e-job-template.yaml   | 33 ++++++++-
 .../azure-cni-overlay-e2e-step-template.yaml  | 72 ++++++++++--------
 ...ium-dualstackoverlay-e2e-job-template.yaml |  2 +
 ...um-dualstackoverlay-e2e-step-template.yaml | 38 +++++++++-
 .../cilium-overlay-e2e-job-template.yaml      |  2 +
 .../cilium-overlay-e2e-step-template.yaml     | 38 +++++++++-
 .../cilium-overlay-e2e-job-template.yaml      |  2 +
 .../cilium-overlay-e2e-step-template.yaml     | 38 +++++++++-
 .../cilium/cilium-e2e-job-template.yaml       |  2 +
 .../cilium/cilium-e2e-step-template.yaml      | 51 +++++++++----
 .../dualstackoverlay-e2e-job-template.yaml    | 32 +++++++-
 .../dualstackoverlay-e2e-step-template.yaml   | 73 ++++++++++---------
 14 files changed, 335 insertions(+), 86 deletions(-)

diff --git a/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
index 50257112d9..b96f841658 100644
--- a/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
+++ b/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
@@ -59,6 +59,8 @@ stages:
             parameters:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
+              os: linux
+              scaleup: 100
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
         parameters:
diff --git a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
index e6bf4b7243..58d1402b49 100644
--- a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
+++ b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
@@ -47,6 +47,42 @@ steps:
     name: "aksswifte2e"
     displayName: "Run AKS Swift E2E"
 
+  - task: AzureCLI@1
+    inputs:
+      azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+      scriptLocation: "inlineScript"
+      scriptType: "bash"
+      addSpnToEnvironment: true
+      inlineScript: |
+        set -e
+        kubectl get po -owide -A
+        clusterName=${{ parameters.clusterName }}
+        echo "Restarting nodes"
+        for val in $(az vmss list -g MC_${clusterName}_${clusterName}_$(REGION_AKS_CLUSTER_TEST) --query "[].name" -o tsv); do
+          make -C ./hack/aks restart-vmss AZCLI=az CLUSTER=${clusterName} REGION=$(REGION_AKS_CLUSTER_TEST) VMSS_NAME=${val}
+        done
+    displayName: "Restart Nodes"
+
+  - task: AzureCLI@1
+    inputs:
+      azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+      scriptLocation: "inlineScript"
+      scriptType: "bash"
+      addSpnToEnvironment: true
+      inlineScript: |
+        cd test/integration/load
+        clusterName=${{ parameters.clusterName }}
+        make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
+        make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
+
+        # Scale Cluster Up/Down to confirm functioning CNS
+        ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+        kubectl get pods -owide -A
+        echo "Validating Node Restart"
+        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+    displayName: "Validate Node Restart"
+    retryCountOnTaskFailure: 3
+
   - script: |
       echo "Run wireserver and metadata connectivity Tests"
       bash test/network/wireserver_metadata_test.sh
diff --git a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
index 626606c499..e0d7704c6d 100644
--- a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
@@ -45,6 +45,7 @@ stages:
     jobs:
       - job: ${{ parameters.name }}_linux
         displayName: Azure CNI Overlay Test Suite | Linux - (${{ parameters.name }})
+        timeoutInMinutes: 120
         pool:
           name: $(BUILD_POOL_NAME_DEFAULT)
           demands:
@@ -56,10 +57,38 @@ stages:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
               os: linux
+              scaleup: 100
+
+      - job: windows_nodepool
+        displayName: Add Windows Nodepool
+        dependsOn: ${{ parameters.name }}_linux
+        pool:
+          name: $(BUILD_POOL_NAME_DEFAULT)
+          demands:
+          - agent.os -equals Linux
+          - Role -equals $(CUSTOM_E2E_ROLE)
+        steps:
+          - task: AzureCLI@2
+            inputs:
+              azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+              scriptLocation: "inlineScript"
+              scriptType: "bash"
+              addSpnToEnvironment: true
+              inlineScript: |
+                set -e
+                make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }} VM_SIZE_WIN=${{ parameters.vmSizeWin }}
+                echo "Windows node are successfully added to v4 Overlay Cluster"
+                kubectl cluster-info
+                kubectl get node -owide
+                kubectl get po -owide -A
+            name: "Add_Windows_Node"
+            displayName: "Add windows node on v4 overlay cluster"
+
 
       - job: ${{ parameters.name }}_windows
         displayName: Azure CNI Overlay Test Suite | Windows - (${{ parameters.name }})
-        dependsOn: ${{ parameters.name }}_linux
+        timeoutInMinutes: 120
+        dependsOn: windows_nodepool
         pool:
           name: $(BUILD_POOL_NAME_DEFAULT)
           demands:
@@ -71,7 +100,7 @@ stages:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
               os: windows
-              vmSizeWin: ${{ parameters.vmSize }} # Matching linux vmSize
+              scaleup: 50
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
         parameters:
diff --git a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml
index cd942cdb89..e2c1e5c451 100644
--- a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml
@@ -67,27 +67,15 @@ steps:
           clusterName=${{ parameters.clusterName }}
           make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
           make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
+
+          # Scale Cluster Up/Down to confirm functioning CNS
+          ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
           kubectl get pods -owide -A
           echo "Validating Node Restart"
-          CNI_TYPE=cniv2 RESTART_CASE=true go test -timeout 30m -tags load -run ^TestValidateState$
+          make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
       displayName: "Validate Node Restart"
       retryCountOnTaskFailure: 3
 
-    - script: |
-        echo "validate pod IP assignment before CNS restart"
-        kubectl get pod -owide -A
-        echo "validate pod state before CNS restarts"
-        cd test/integration/load
-        CNI_TYPE=cniv2 go test -timeout 30m -tags load -run ^TestValidateState$
-        kubectl rollout restart ds azure-cns -n kube-system
-        kubectl rollout status ds azure-cns -n kube-system
-        kubectl get pod -owide -A
-        echo "validate pods after CNS restart"
-        CNI_TYPE=cniv2 go test -timeout 30m -tags load -run ^TestValidateState$
-      name: "restartCNS_ValidatePodState"
-      displayName: "Restart CNS and validate pod state"
-      retryCountOnTaskFailure: 3
-
     - script: |
         echo "Run wireserver and metadata connectivity Tests"
         bash test/network/wireserver_metadata_test.sh
@@ -96,22 +84,6 @@ steps:
       displayName: "Run Wireserver and Metadata Connectivity Tests"
 
   - ${{ if eq(parameters.os, 'windows') }}:
-    - task: AzureCLI@2
-      inputs:
-        azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
-        scriptLocation: "inlineScript"
-        scriptType: "bash"
-        addSpnToEnvironment: true
-        inlineScript: |
-          set -e
-          make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }} VM_SIZE_WIN=${{ parameters.vmSizeWin }}
-          echo "Windows node are successfully added to v4 Overlay Cluster"
-          kubectl cluster-info
-          kubectl get node -owide
-          kubectl get po -owide -A
-      name: "Add_Windows_Node"
-      displayName: "Add windows node on v4 overlay cluster"
-
     - script: |
         nodeList=`kubectl get node -owide | grep Windows | awk '{print $1}'`
         for node in $nodeList; do
@@ -132,3 +104,39 @@ steps:
       name: "WindowsV4OverlayDatapathTests"
       displayName: "Windows v4Overlay Datapath Tests"
       retryCountOnTaskFailure: 3
+
+    - task: AzureCLI@1
+      inputs:
+        azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+        scriptLocation: "inlineScript"
+        scriptType: "bash"
+        addSpnToEnvironment: true
+        inlineScript: |
+          set -e
+          kubectl get po -owide -A
+          clusterName=${{ parameters.clusterName }}
+          echo "Restarting nodes"
+          for val in $(az vmss list -g MC_${clusterName}_${clusterName}_$(REGION_AKS_CLUSTER_TEST) --query "[].name" -o tsv); do
+            make -C ./hack/aks restart-vmss AZCLI=az CLUSTER=${clusterName} REGION=$(REGION_AKS_CLUSTER_TEST) VMSS_NAME=${val}
+          done
+      displayName: "Restart Nodes"
+
+    - task: AzureCLI@1
+      inputs:
+        azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+        scriptLocation: "inlineScript"
+        scriptType: "bash"
+        addSpnToEnvironment: true
+        inlineScript: |
+          cd test/integration/load
+          clusterName=${{ parameters.clusterName }}
+          make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
+          make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
+
+          # Scale Cluster Up/Down to confirm functioning CNS
+          ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+          kubectl get pods -owide -A
+          echo "Validating Node Restart"
+          make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+      displayName: "Validate Node Restart"
+      retryCountOnTaskFailure: 3
diff --git a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml
index bf8cb35b2a..46edc72724 100644
--- a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml
@@ -55,6 +55,8 @@ stages:
             parameters:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
+              os: linux
+              scaleup: 100
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
         parameters:
diff --git a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml
index d83135426c..2e8c8243b3 100644
--- a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml
@@ -68,6 +68,42 @@ steps:
     name: "CiliumStatus"
     displayName: "Cilium Status"
 
+  - task: AzureCLI@1
+    inputs:
+      azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+      scriptLocation: "inlineScript"
+      scriptType: "bash"
+      addSpnToEnvironment: true
+      inlineScript: |
+        set -e
+        kubectl get po -owide -A
+        clusterName=${{ parameters.clusterName }}
+        echo "Restarting nodes"
+        for val in $(az vmss list -g MC_${clusterName}_${clusterName}_$(REGION_AKS_CLUSTER_TEST) --query "[].name" -o tsv); do
+          make -C ./hack/aks restart-vmss AZCLI=az CLUSTER=${clusterName} REGION=$(REGION_AKS_CLUSTER_TEST) VMSS_NAME=${val}
+        done
+    displayName: "Restart Nodes"
+
+  - task: AzureCLI@1
+    inputs:
+      azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+      scriptLocation: "inlineScript"
+      scriptType: "bash"
+      addSpnToEnvironment: true
+      inlineScript: |
+        cd test/integration/load
+        clusterName=${{ parameters.clusterName }}
+        make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
+        make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
+
+        # Scale Cluster Up/Down to confirm functioning CNS
+        ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+        kubectl get pods -owide -A
+        echo "Validating Node Restart"
+        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+    displayName: "Validate Node Restart"
+    retryCountOnTaskFailure: 3
+
   - script: |
       echo "Run Cilium Connectivity Tests"
       cilium status
@@ -109,7 +145,7 @@ steps:
     retryCountOnTaskFailure: 3
     name: "WireserverMetadataConnectivityTests"
     displayName: "Run Wireserver and Metadata Connectivity Tests"
-  
+
   - script: |
       cd hack/scripts
       chmod +x async-delete-test.sh
diff --git a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml
index 01ab0823eb..3d89975d60 100644
--- a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml
@@ -59,6 +59,8 @@ stages:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
               testHubble: ${{ parameters.testHubble }}
+              os: linux
+              scaleup: 100
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
         parameters:
diff --git a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml
index fe5970993c..8cdeeda968 100644
--- a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml
@@ -72,6 +72,42 @@ steps:
     name: "CiliumStatus"
     displayName: "Cilium Status"
 
+  - task: AzureCLI@1
+    inputs:
+      azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+      scriptLocation: "inlineScript"
+      scriptType: "bash"
+      addSpnToEnvironment: true
+      inlineScript: |
+        set -e
+        kubectl get po -owide -A
+        clusterName=${{ parameters.clusterName }}
+        echo "Restarting nodes"
+        for val in $(az vmss list -g MC_${clusterName}_${clusterName}_$(REGION_AKS_CLUSTER_TEST) --query "[].name" -o tsv); do
+          make -C ./hack/aks restart-vmss AZCLI=az CLUSTER=${clusterName} REGION=$(REGION_AKS_CLUSTER_TEST) VMSS_NAME=${val}
+        done
+    displayName: "Restart Nodes"
+
+  - task: AzureCLI@1
+    inputs:
+      azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+      scriptLocation: "inlineScript"
+      scriptType: "bash"
+      addSpnToEnvironment: true
+      inlineScript: |
+        cd test/integration/load
+        clusterName=${{ parameters.clusterName }}
+        make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
+        make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
+
+        # Scale Cluster Up/Down to confirm functioning CNS
+        ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+        kubectl get pods -owide -A
+        echo "Validating Node Restart"
+        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+    displayName: "Validate Node Restart"
+    retryCountOnTaskFailure: 3
+
   - script: |
       echo "Run Cilium Connectivity Tests"
       cilium status
@@ -147,7 +183,7 @@ steps:
     retryCountOnTaskFailure: 3
     name: "WireserverMetadataConnectivityTests"
     displayName: "Run Wireserver and Metadata Connectivity Tests"
-  
+
   - script: |
       cd hack/scripts
       chmod +x async-delete-test.sh
diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
index 4a0a840b94..19b72f6f08 100644
--- a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
@@ -57,6 +57,8 @@ stages:
             parameters:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
+              os: linux
+              scaleup: 100
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
         parameters:
diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
index 991fa32e40..2c7104d316 100644
--- a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
@@ -93,6 +93,42 @@ steps:
     name: "CiliumStatus"
     displayName: "Cilium Status"
 
+  - task: AzureCLI@1
+    inputs:
+      azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+      scriptLocation: "inlineScript"
+      scriptType: "bash"
+      addSpnToEnvironment: true
+      inlineScript: |
+        set -e
+        kubectl get po -owide -A
+        clusterName=${{ parameters.clusterName }}
+        echo "Restarting nodes"
+        for val in $(az vmss list -g MC_${clusterName}_${clusterName}_$(REGION_AKS_CLUSTER_TEST) --query "[].name" -o tsv); do
+          make -C ./hack/aks restart-vmss AZCLI=az CLUSTER=${clusterName} REGION=$(REGION_AKS_CLUSTER_TEST) VMSS_NAME=${val}
+        done
+    displayName: "Restart Nodes"
+
+  - task: AzureCLI@1
+    inputs:
+      azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+      scriptLocation: "inlineScript"
+      scriptType: "bash"
+      addSpnToEnvironment: true
+      inlineScript: |
+        cd test/integration/load
+        clusterName=${{ parameters.clusterName }}
+        make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
+        make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
+
+        # Scale Cluster Up/Down to confirm functioning CNS
+        ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+        kubectl get pods -owide -A
+        echo "Validating Node Restart"
+        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+    displayName: "Validate Node Restart"
+    retryCountOnTaskFailure: 3
+
   - script: |
       echo "Run Cilium Connectivity Tests"
       cilium status
@@ -186,7 +222,7 @@ steps:
     retryCountOnTaskFailure: 3
     name: "WireserverMetadataConnectivityTests"
     displayName: "Run Wireserver and Metadata Connectivity Tests"
-  
+
   - script: |
       if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then
         echo "Running nightly, skip async delete test"
diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
index 5af6a31ab9..29bd8b6011 100644
--- a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
@@ -60,6 +60,8 @@ stages:
             parameters:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
+              os: linux
+              scaleup: 100
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
         parameters:
diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
index 2e4a20a4d9..290d50a832 100644
--- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
@@ -72,6 +72,42 @@ steps:
     name: "CiliumStatus"
     displayName: "Cilium Status"
 
+  - task: AzureCLI@1
+    inputs:
+      azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+      scriptLocation: "inlineScript"
+      scriptType: "bash"
+      addSpnToEnvironment: true
+      inlineScript: |
+        set -e
+        kubectl get po -owide -A
+        clusterName=${{ parameters.clusterName }}
+        echo "Restarting nodes"
+        for val in $(az vmss list -g MC_${clusterName}_${clusterName}_$(REGION_AKS_CLUSTER_TEST) --query "[].name" -o tsv); do
+          make -C ./hack/aks restart-vmss AZCLI=az CLUSTER=${clusterName} REGION=$(REGION_AKS_CLUSTER_TEST) VMSS_NAME=${val}
+        done
+    displayName: "Restart Nodes"
+
+  - task: AzureCLI@1
+    inputs:
+      azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+      scriptLocation: "inlineScript"
+      scriptType: "bash"
+      addSpnToEnvironment: true
+      inlineScript: |
+        cd test/integration/load
+        clusterName=${{ parameters.clusterName }}
+        make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
+        make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
+
+        # Scale Cluster Up/Down to confirm functioning CNS
+        ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+        kubectl get pods -owide -A
+        echo "Validating Node Restart"
+        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+    displayName: "Validate Node Restart"
+    retryCountOnTaskFailure: 3
+
   - script: |
       echo "Run Cilium Connectivity Tests"
       cilium status
@@ -94,26 +130,13 @@ steps:
     name: "validatePods"
     displayName: "Validate Pods"
 
-  - script: |
-      echo "validate pod IP assignment before CNS restart"
-      kubectl get pod -owide -A
-      make test-validate-state
-      echo "restart CNS"
-      kubectl rollout restart ds azure-cns -n kube-system
-      kubectl rollout status ds azure-cns -n kube-system
-      kubectl get pod -owide -A
-      echo "validate pods after CNS restart"
-      make test-validate-state
-    name: "restartCNS"
-    displayName: "Restart CNS and validate pods"
-
   - script: |
       echo "Run wireserver and metadata connectivity Tests"
       bash test/network/wireserver_metadata_test.sh
     retryCountOnTaskFailure: 3
     name: "WireserverMetadataConnectivityTests"
     displayName: "Run Wireserver and Metadata Connectivity Tests"
-  
+
   - script: |
       cd hack/scripts
       chmod +x async-delete-test.sh
diff --git a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
index 0093dd8e48..2bfe0d509b 100644
--- a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
@@ -46,6 +46,7 @@ stages:
     jobs:
       - job: ${{ parameters.name }}_linux
         displayName: DualStack Overlay Test Suite | Linux - (${{ parameters.name }})
+        timeoutInMinutes: 120
         pool:
           name: $(BUILD_POOL_NAME_DEFAULT)
           demands:
@@ -57,10 +58,37 @@ stages:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
               os: linux
+              scaleup: 100
+
+      - job: windows_nodepool
+        displayName: Add Windows Nodepool
+        dependsOn: ${{ parameters.name }}_linux
+        pool:
+          name: $(BUILD_POOL_NAME_DEFAULT)
+          demands:
+          - agent.os -equals Linux
+          - Role -equals $(CUSTOM_E2E_ROLE)
+        steps:
+          - task: AzureCLI@2
+            inputs:
+              azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+              scriptLocation: "inlineScript"
+              scriptType: "bash"
+              addSpnToEnvironment: true
+              inlineScript: |
+                set -e
+                make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }} VM_SIZE_WIN=${{ parameters.vmSizeWin }}
+                echo "Windows nodes have been successfully added to DualStack Overlay Cluster"
+                kubectl cluster-info
+                kubectl get node -owide
+                kubectl get po -owide -A
+            name: "Add_Windows_Node"
+            displayName: "Add windows node"
 
       - job: ${{ parameters.name }}_windows
         displayName: DualStack Overlay Test Suite | Windows - (${{ parameters.name }})
-        dependsOn: ${{ parameters.name }}_linux
+        timeoutInMinutes: 120
+        dependsOn: windows_nodepool
         pool:
           name: $(BUILD_POOL_NAME_DEFAULT)
           demands:
@@ -72,7 +100,7 @@ stages:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
               os: windows
-              vmSizeWin: ${{ parameters.vmSize }} # Matching linux vmSize
+              scaleup: 50
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
         parameters:
diff --git a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml
index 3a519f83ce..40dab4b8e6 100644
--- a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml
@@ -80,44 +80,16 @@ steps:
           clusterName=${{ parameters.clusterName }}
           make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
           make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_DUALSTACKOVERLAY_CLUSTER_TEST)
-          kubectl get pods -A
+
+          # Scale Cluster Up/Down to confirm functioning CNS
+          ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+          kubectl get pods -owide -A
           echo "Validating Node Restart"
-          CNI_TYPE=dualstack RESTART_CASE=true go test -timeout 30m -tags load -run ^TestValidateState$
+          make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
       displayName: "Validate Node Restart"
       retryCountOnTaskFailure: 3
 
-    - script: |
-        echo "validate pod IP assignment before CNS restart"
-        kubectl get pod -owide -A
-        echo "validate pod state before CNS restarts"
-        cd test/integration/load
-        CNI_TYPE=dualstack go test -timeout 30m -tags load -run ^TestValidateState$
-        kubectl rollout restart ds azure-cns -n kube-system
-        kubectl rollout status ds azure-cns -n kube-system
-        kubectl get pod -owide -A
-        echo "validate pods after CNS restarts"
-        CNI_TYPE=dualstack go test -timeout 30m -tags load -run ^TestValidateState$
-      name: "restartCNS_ValidatePodState"
-      displayName: "Restart CNS and Validate Pod State"
-      retryCountOnTaskFailure: 3
-
   - ${{ if eq(parameters.os, 'windows') }}:
-    - task: AzureCLI@2
-      inputs:
-        azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
-        scriptLocation: "inlineScript"
-        scriptType: "bash"
-        addSpnToEnvironment: true
-        inlineScript: |
-          set -e
-          make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }} VM_SIZE_WIN=${{ parameters.vmSizeWin }}
-          echo "Windows nodes have been successfully added to DualStack Overlay Cluster"
-          kubectl cluster-info
-          kubectl get node -owide
-          kubectl get po -owide -A
-      name: "Add_Windows_Node"
-      displayName: "Add windows node"
-
     - script: |
         nodeList=`kubectl get node -owide | grep Windows | awk '{print $1}'`
         for node in $nodeList; do
@@ -138,3 +110,38 @@ steps:
       name: "WindowsDualStackOverlayDatapathTests"
       displayName: "Windows DualStack Overlay Datapath Tests"
       retryCountOnTaskFailure: 3
+
+    - task: AzureCLI@1
+      inputs:
+        azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+        scriptLocation: "inlineScript"
+        scriptType: "bash"
+        addSpnToEnvironment: true
+        inlineScript: |
+          set -e
+          clusterName=${{ parameters.clusterName }}
+          echo "Restarting nodes"
+          for val in $(az vmss list -g MC_${clusterName}_${clusterName}_$(REGION_DUALSTACKOVERLAY_CLUSTER_TEST) --query "[].name" -o tsv); do
+            make -C ./hack/aks restart-vmss AZCLI=az CLUSTER=${clusterName} REGION=$(REGION_DUALSTACKOVERLAY_CLUSTER_TEST) VMSS_NAME=${val}
+          done
+      displayName: "Restart Nodes"
+
+    - task: AzureCLI@1
+      inputs:
+        azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+        scriptLocation: "inlineScript"
+        scriptType: "bash"
+        addSpnToEnvironment: true
+        inlineScript: |
+          cd test/integration/load
+          clusterName=${{ parameters.clusterName }}
+          make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
+          make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_DUALSTACKOVERLAY_CLUSTER_TEST)
+
+          # Scale Cluster Up/Down to confirm functioning CNS
+          ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+          kubectl get pods -owide -A
+          echo "Validating Node Restart"
+          make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+      displayName: "Validate Node Restart"
+      retryCountOnTaskFailure: 3

From 92d88a99fbeed4dadc72866f4187d82ce6534119 Mon Sep 17 00:00:00 2001
From: jpayne3506 <payne.3506@gmail.com>
Date: Fri, 9 Aug 2024 12:03:11 -0700
Subject: [PATCH 2/6] chore: change directory after scale

---
 .pipelines/singletenancy/aks-swift/e2e-step-template.yaml     | 2 ++
 .../azure-cni-overlay-e2e-step-template.yaml                  | 2 ++
 .../cilium-dualstackoverlay-e2e-step-template.yaml            | 2 ++
 .../cilium-overlay-e2e-step-template.yaml                     | 2 ++
 .../cilium-overlay/cilium-overlay-e2e-step-template.yaml      | 2 ++
 .pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml | 2 ++
 .../dualstack-overlay/dualstackoverlay-e2e-step-template.yaml | 4 ++++
 7 files changed, 16 insertions(+)

diff --git a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
index 58d1402b49..02de72fd97 100644
--- a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
+++ b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
@@ -78,6 +78,8 @@ steps:
         # Scale Cluster Up/Down to confirm functioning CNS
         ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
         kubectl get pods -owide -A
+
+        cd ../../..
         echo "Validating Node Restart"
         make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
     displayName: "Validate Node Restart"
diff --git a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml
index e2c1e5c451..c2a81fc48f 100644
--- a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml
@@ -71,6 +71,8 @@ steps:
           # Scale Cluster Up/Down to confirm functioning CNS
           ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
           kubectl get pods -owide -A
+
+          cd ../../..
           echo "Validating Node Restart"
           make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
       displayName: "Validate Node Restart"
diff --git a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml
index 2e8c8243b3..c199a06516 100644
--- a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml
@@ -99,6 +99,8 @@ steps:
         # Scale Cluster Up/Down to confirm functioning CNS
         ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
         kubectl get pods -owide -A
+
+        cd ../../..
         echo "Validating Node Restart"
         make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
     displayName: "Validate Node Restart"
diff --git a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml
index 8cdeeda968..4489645f9d 100644
--- a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml
@@ -103,6 +103,8 @@ steps:
         # Scale Cluster Up/Down to confirm functioning CNS
         ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
         kubectl get pods -owide -A
+
+        cd ../../..
         echo "Validating Node Restart"
         make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
     displayName: "Validate Node Restart"
diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
index 2c7104d316..b6c9cb09d7 100644
--- a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
@@ -124,6 +124,8 @@ steps:
         # Scale Cluster Up/Down to confirm functioning CNS
         ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
         kubectl get pods -owide -A
+
+        cd ../../..
         echo "Validating Node Restart"
         make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
     displayName: "Validate Node Restart"
diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
index 290d50a832..de2046e594 100644
--- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
@@ -103,6 +103,8 @@ steps:
         # Scale Cluster Up/Down to confirm functioning CNS
         ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
         kubectl get pods -owide -A
+
+        cd ../../..
         echo "Validating Node Restart"
         make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
     displayName: "Validate Node Restart"
diff --git a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml
index 40dab4b8e6..5a3e97e6b5 100644
--- a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml
@@ -84,6 +84,8 @@ steps:
           # Scale Cluster Up/Down to confirm functioning CNS
           ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
           kubectl get pods -owide -A
+
+          cd ../../..
           echo "Validating Node Restart"
           make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
       displayName: "Validate Node Restart"
@@ -141,6 +143,8 @@ steps:
           # Scale Cluster Up/Down to confirm functioning CNS
           ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
           kubectl get pods -owide -A
+
+          cd ../../..
           echo "Validating Node Restart"
           make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
       displayName: "Validate Node Restart"

From da5c19180fcb25b156f009c311c8981993a8422c Mon Sep 17 00:00:00 2001
From: jpayne3506 <payne.3506@gmail.com>
Date: Fri, 9 Aug 2024 15:48:03 -0700
Subject: [PATCH 3/6] chore: fixup nodepool

---
 .../azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml   | 2 +-
 .../dualstack-overlay/dualstackoverlay-e2e-job-template.yaml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
index e0d7704c6d..56a443094b 100644
--- a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
@@ -76,7 +76,7 @@ stages:
               addSpnToEnvironment: true
               inlineScript: |
                 set -e
-                make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }} VM_SIZE_WIN=${{ parameters.vmSizeWin }}
+                make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }}-$(commitID) VM_SIZE_WIN=${{ parameters.vmSizeWin }}
                 echo "Windows node are successfully added to v4 Overlay Cluster"
                 kubectl cluster-info
                 kubectl get node -owide
diff --git a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
index 2bfe0d509b..d78d4ce0ff 100644
--- a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
@@ -77,7 +77,7 @@ stages:
               addSpnToEnvironment: true
               inlineScript: |
                 set -e
-                make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }} VM_SIZE_WIN=${{ parameters.vmSizeWin }}
+                make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }}-$(commitID) VM_SIZE_WIN=${{ parameters.vmSizeWin }}
                 echo "Windows nodes have been successfully added to DualStack Overlay Cluster"
                 kubectl cluster-info
                 kubectl get node -owide

From cc07553f71d6bf74eedd69697ca029208e07deba Mon Sep 17 00:00:00 2001
From: jpayne3506 <payne.3506@gmail.com>
Date: Sun, 11 Aug 2024 08:01:58 -0700
Subject: [PATCH 4/6] chore: pipeline cleanup

---
 .../azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml  | 3 ++-
 .../dualstack-overlay/dualstackoverlay-e2e-job-template.yaml   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
index 56a443094b..2bc03a4726 100644
--- a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
@@ -76,7 +76,8 @@ stages:
               addSpnToEnvironment: true
               inlineScript: |
                 set -e
-                make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }}-$(commitID) VM_SIZE_WIN=${{ parameters.vmSizeWin }}
+                make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
+                make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }}-$(commitID) VM_SIZE_WIN=${{ parameters.vmSize }}
                 echo "Windows node are successfully added to v4 Overlay Cluster"
                 kubectl cluster-info
                 kubectl get node -owide
diff --git a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
index d78d4ce0ff..8d4daa617e 100644
--- a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
@@ -77,7 +77,8 @@ stages:
               addSpnToEnvironment: true
               inlineScript: |
                 set -e
-                make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }}-$(commitID) VM_SIZE_WIN=${{ parameters.vmSizeWin }}
+                make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
+                make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }}-$(commitID) VM_SIZE_WIN=${{ parameters.vmSize }}
                 echo "Windows nodes have been successfully added to DualStack Overlay Cluster"
                 kubectl cluster-info
                 kubectl get node -owide

From 443cde834bf9944f1bdac0e5bcc761d39037c851 Mon Sep 17 00:00:00 2001
From: jpayne3506 <payne.3506@gmail.com>
Date: Wed, 14 Aug 2024 10:27:00 -0700
Subject: [PATCH 5/6] ci: cleanup test resources

---
 .pipelines/singletenancy/aks-swift/e2e-step-template.yaml      | 1 +
 .../azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml | 2 ++
 .../cilium-dualstackoverlay-e2e-step-template.yaml             | 3 ++-
 .../cilium-overlay-e2e-step-template.yaml                      | 3 ++-
 .../cilium-overlay/cilium-overlay-e2e-step-template.yaml       | 3 ++-
 .pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml  | 3 ++-
 .../dualstack-overlay/dualstackoverlay-e2e-step-template.yaml  | 2 ++
 7 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
index 02de72fd97..29a83bcad8 100644
--- a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
+++ b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
@@ -82,6 +82,7 @@ steps:
         cd ../../..
         echo "Validating Node Restart"
         make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+        kubectl delete ns load-test
     displayName: "Validate Node Restart"
     retryCountOnTaskFailure: 3
 
diff --git a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml
index c2a81fc48f..9503ff766a 100644
--- a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml
@@ -75,6 +75,7 @@ steps:
           cd ../../..
           echo "Validating Node Restart"
           make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+          kubectl delete ns load-test
       displayName: "Validate Node Restart"
       retryCountOnTaskFailure: 3
 
@@ -140,5 +141,6 @@ steps:
           kubectl get pods -owide -A
           echo "Validating Node Restart"
           make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+          kubectl delete ns load-test
       displayName: "Validate Node Restart"
       retryCountOnTaskFailure: 3
diff --git a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml
index c199a06516..8e3ab5a75e 100644
--- a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml
@@ -102,7 +102,8 @@ steps:
 
         cd ../../..
         echo "Validating Node Restart"
-        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true
+        kubectl delete ns load-test
     displayName: "Validate Node Restart"
     retryCountOnTaskFailure: 3
 
diff --git a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml
index 4489645f9d..529b7752f9 100644
--- a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml
@@ -106,7 +106,8 @@ steps:
 
         cd ../../..
         echo "Validating Node Restart"
-        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true
+        kubectl delete ns load-test
     displayName: "Validate Node Restart"
     retryCountOnTaskFailure: 3
 
diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
index b6c9cb09d7..bddd8ed847 100644
--- a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
@@ -127,7 +127,8 @@ steps:
 
         cd ../../..
         echo "Validating Node Restart"
-        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true
+        kubectl delete ns load-test
     displayName: "Validate Node Restart"
     retryCountOnTaskFailure: 3
 
diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
index de2046e594..e802d31a44 100644
--- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
@@ -106,7 +106,8 @@ steps:
 
         cd ../../..
         echo "Validating Node Restart"
-        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true
+        kubectl delete ns load-test
     displayName: "Validate Node Restart"
     retryCountOnTaskFailure: 3
 
diff --git a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml
index 5a3e97e6b5..c7a75d73ad 100644
--- a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml
@@ -88,6 +88,7 @@ steps:
           cd ../../..
           echo "Validating Node Restart"
           make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+          kubectl delete ns load-test
       displayName: "Validate Node Restart"
       retryCountOnTaskFailure: 3
 
@@ -147,5 +148,6 @@ steps:
           cd ../../..
           echo "Validating Node Restart"
           make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+          kubectl delete ns load-test
       displayName: "Validate Node Restart"
       retryCountOnTaskFailure: 3

From c7d40689e4993b6f507af50ee4f85e561be7bdd9 Mon Sep 17 00:00:00 2001
From: jpayne3506 <payne.3506@gmail.com>
Date: Thu, 15 Aug 2024 15:45:50 -0700
Subject: [PATCH 6/6] chore: address comments

---
 .../aks-swift/e2e-job-template.yaml             |  1 -
 .../aks-swift/e2e-step-template.yaml            |  8 +++-----
 .../azure-cni-overlay-e2e-step-template.yaml    | 17 +++++++----------
 ...ilium-dualstackoverlay-e2e-job-template.yaml |  1 -
 ...lium-dualstackoverlay-e2e-step-template.yaml |  8 +++-----
 .../cilium-overlay-e2e-job-template.yaml        |  1 -
 .../cilium-overlay-e2e-step-template.yaml       |  8 +++-----
 .../cilium-overlay-e2e-job-template.yaml        |  1 -
 .../cilium-overlay-e2e-step-template.yaml       |  9 ++++-----
 .../cilium/cilium-e2e-job-template.yaml         |  1 -
 .../cilium/cilium-e2e-step-template.yaml        |  8 +++-----
 .../dualstackoverlay-e2e-step-template.yaml     | 17 ++++++-----------
 12 files changed, 29 insertions(+), 51 deletions(-)

diff --git a/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
index b96f841658..126b56d766 100644
--- a/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
+++ b/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
@@ -59,7 +59,6 @@ stages:
             parameters:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
-              os: linux
               scaleup: 100
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
diff --git a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
index 29a83bcad8..72c1d5d18c 100644
--- a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
+++ b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
@@ -1,6 +1,7 @@
 parameters:
   name: ""
   clusterName: ""
+  scaleup: ""
 
 steps:
   - bash: |
@@ -71,17 +72,14 @@ steps:
       addSpnToEnvironment: true
       inlineScript: |
         cd test/integration/load
-        clusterName=${{ parameters.clusterName }}
-        make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
-        make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
 
         # Scale Cluster Up/Down to confirm functioning CNS
-        ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+        ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=linux go test -count 1 -timeout 30m -tags load -run ^TestLoad$
         kubectl get pods -owide -A
 
         cd ../../..
         echo "Validating Node Restart"
-        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+        make test-validate-state OS_TYPE=linux RESTART_CASE=true CNI_TYPE=cniv2
         kubectl delete ns load-test
     displayName: "Validate Node Restart"
     retryCountOnTaskFailure: 3
diff --git a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml
index 9503ff766a..a030474a82 100644
--- a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml
@@ -2,6 +2,7 @@ parameters:
   name: ""
   clusterName: ""
   os: ""
+  scaleup: ""
 
 steps:
   - bash: |
@@ -64,17 +65,14 @@ steps:
         addSpnToEnvironment: true
         inlineScript: |
           cd test/integration/load
-          clusterName=${{ parameters.clusterName }}
-          make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
-          make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
 
           # Scale Cluster Up/Down to confirm functioning CNS
-          ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+          ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=linux go test -count 1 -timeout 30m -tags load -run ^TestLoad$
           kubectl get pods -owide -A
 
           cd ../../..
           echo "Validating Node Restart"
-          make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+          make test-validate-state OS_TYPE=linux RESTART_CASE=true CNI_TYPE=cniv2
           kubectl delete ns load-test
       displayName: "Validate Node Restart"
       retryCountOnTaskFailure: 3
@@ -132,15 +130,14 @@ steps:
         addSpnToEnvironment: true
         inlineScript: |
           cd test/integration/load
-          clusterName=${{ parameters.clusterName }}
-          make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
-          make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
 
           # Scale Cluster Up/Down to confirm functioning CNS
-          ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+          ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=windows go test -count 1 -timeout 30m -tags load -run ^TestLoad$
           kubectl get pods -owide -A
+
+          cd ../../..
           echo "Validating Node Restart"
-          make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+          make test-validate-state OS_TYPE=windows RESTART_CASE=true CNI_TYPE=cniv2
           kubectl delete ns load-test
       displayName: "Validate Node Restart"
       retryCountOnTaskFailure: 3
diff --git a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml
index 46edc72724..fc8ece1a3a 100644
--- a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml
@@ -55,7 +55,6 @@ stages:
             parameters:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
-              os: linux
               scaleup: 100
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
diff --git a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml
index 8e3ab5a75e..bf636f3403 100644
--- a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml
@@ -1,6 +1,7 @@
 parameters:
   name: ""
   clusterName: ""
+  scaleup: ""
 
 steps:
 
@@ -92,17 +93,14 @@ steps:
       addSpnToEnvironment: true
       inlineScript: |
         cd test/integration/load
-        clusterName=${{ parameters.clusterName }}
-        make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
-        make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
 
         # Scale Cluster Up/Down to confirm functioning CNS
-        ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+        ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=linux go test -count 1 -timeout 30m -tags load -run ^TestLoad$
         kubectl get pods -owide -A
 
         cd ../../..
         echo "Validating Node Restart"
-        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true
+        make test-validate-state OS_TYPE=linux RESTART_CASE=true CNI_TYPE=cilium_dualstack
         kubectl delete ns load-test
     displayName: "Validate Node Restart"
     retryCountOnTaskFailure: 3
diff --git a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml
index 3d89975d60..7753baa716 100644
--- a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml
@@ -59,7 +59,6 @@ stages:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
               testHubble: ${{ parameters.testHubble }}
-              os: linux
               scaleup: 100
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
diff --git a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml
index 529b7752f9..259ba97f9c 100644
--- a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml
@@ -2,6 +2,7 @@ parameters:
   name: ""
   clusterName: ""
   testHubble: false
+  scaleup: ""
 
 steps:
   - bash: |
@@ -96,17 +97,14 @@ steps:
       addSpnToEnvironment: true
       inlineScript: |
         cd test/integration/load
-        clusterName=${{ parameters.clusterName }}
-        make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
-        make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
 
         # Scale Cluster Up/Down to confirm functioning CNS
-        ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+        ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=linux go test -count 1 -timeout 30m -tags load -run ^TestLoad$
         kubectl get pods -owide -A
 
         cd ../../..
         echo "Validating Node Restart"
-        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true
+        make test-validate-state OS_TYPE=linux RESTART_CASE=true
         kubectl delete ns load-test
     displayName: "Validate Node Restart"
     retryCountOnTaskFailure: 3
diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
index 19b72f6f08..17c5245dac 100644
--- a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
@@ -57,7 +57,6 @@ stages:
             parameters:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
-              os: linux
               scaleup: 100
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
index bddd8ed847..892df928b5 100644
--- a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
@@ -2,6 +2,8 @@ parameters:
   name: ""
   clusterName: ""
   testHubble: false
+  scaleup: ""
+
 
 steps:
   - bash: |
@@ -117,17 +119,14 @@ steps:
       addSpnToEnvironment: true
       inlineScript: |
         cd test/integration/load
-        clusterName=${{ parameters.clusterName }}
-        make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
-        make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
 
         # Scale Cluster Up/Down to confirm functioning CNS
-        ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+        ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=linux go test -count 1 -timeout 30m -tags load -run ^TestLoad$
         kubectl get pods -owide -A
 
         cd ../../..
         echo "Validating Node Restart"
-        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true
+        make test-validate-state OS_TYPE=linux RESTART_CASE=true
         kubectl delete ns load-test
     displayName: "Validate Node Restart"
     retryCountOnTaskFailure: 3
diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
index 29bd8b6011..b5ce250259 100644
--- a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
@@ -60,7 +60,6 @@ stages:
             parameters:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
-              os: linux
               scaleup: 100
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
index e802d31a44..d98f7f484f 100644
--- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
@@ -1,6 +1,7 @@
 parameters:
   name: ""
   clusterName: ""
+  scaleup: ""
 
 steps:
   - bash: |
@@ -96,17 +97,14 @@ steps:
       addSpnToEnvironment: true
       inlineScript: |
         cd test/integration/load
-        clusterName=${{ parameters.clusterName }}
-        make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
-        make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
 
         # Scale Cluster Up/Down to confirm functioning CNS
-        ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+        ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=linux go test -count 1 -timeout 30m -tags load -run ^TestLoad$
         kubectl get pods -owide -A
 
         cd ../../..
         echo "Validating Node Restart"
-        make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true
+        make test-validate-state OS_TYPE=linux RESTART_CASE=true
         kubectl delete ns load-test
     displayName: "Validate Node Restart"
     retryCountOnTaskFailure: 3
diff --git a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml
index c7a75d73ad..324c944abd 100644
--- a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml
@@ -3,6 +3,7 @@ parameters:
   clusterName: ""
   cni: "dualstack"
   os: ""
+  scaleup: ""
 
 steps:
   - bash: |
@@ -37,7 +38,7 @@ steps:
         kubectl cluster-info
         kubectl get node
         kubectl get po -owide -A
-        sudo -E env "PATH=$PATH" make test-load SCALE_UP=32 OS_TYPE=linux CNI_TYPE=cniv2 VALIDATE_STATEFILE=true INSTALL_CNS=true INSTALL_DUALSTACK_OVERLAY=true VALIDATE_DUALSTACK=true CNI_VERSION=$(make cni-version) CNS_VERSION=$(make cns-version) CLEANUP=true
+        sudo -E env "PATH=$PATH" make test-load SCALE_UP=32 OS_TYPE=linux CNI_TYPE=dualstack VALIDATE_STATEFILE=true INSTALL_CNS=true INSTALL_DUALSTACK_OVERLAY=true VALIDATE_DUALSTACK=true CNI_VERSION=$(make cni-version) CNS_VERSION=$(make cns-version) CLEANUP=true
       retryCountOnTaskFailure: 3
       name: "integrationTest"
       displayName: "Run CNS Integration Tests on AKS DualStack Overlay"
@@ -77,17 +78,14 @@ steps:
         addSpnToEnvironment: true
         inlineScript: |
           cd test/integration/load
-          clusterName=${{ parameters.clusterName }}
-          make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
-          make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_DUALSTACKOVERLAY_CLUSTER_TEST)
 
           # Scale Cluster Up/Down to confirm functioning CNS
-          ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+          ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=linux go test -count 1 -timeout 30m -tags load -run ^TestLoad$
           kubectl get pods -owide -A
 
           cd ../../..
           echo "Validating Node Restart"
-          make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+          make test-validate-state OS_TYPE=linux RESTART_CASE=true CNI_TYPE=dualstack
           kubectl delete ns load-test
       displayName: "Validate Node Restart"
       retryCountOnTaskFailure: 3
@@ -137,17 +135,14 @@ steps:
         addSpnToEnvironment: true
         inlineScript: |
           cd test/integration/load
-          clusterName=${{ parameters.clusterName }}
-          make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
-          make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_DUALSTACKOVERLAY_CLUSTER_TEST)
 
           # Scale Cluster Up/Down to confirm functioning CNS
-          ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=${{ parameters.os }} go test -count 1 -timeout 30m -tags load -run ^TestLoad$
+          ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=windows go test -count 1 -timeout 30m -tags load -run ^TestLoad$
           kubectl get pods -owide -A
 
           cd ../../..
           echo "Validating Node Restart"
-          make test-validate-state OS_TYPE=${{ parameters.os }} RESTART_CASE=true CNI_TYPE=cniv2
+          make test-validate-state OS_TYPE=windows RESTART_CASE=true CNI_TYPE=cniv2
           kubectl delete ns load-test
       displayName: "Validate Node Restart"
       retryCountOnTaskFailure: 3