Addressing Comments

Author: jpayne3506

.pipelines/pipeline.yaml

@@ -327,7 +327,7 @@ stages:
       vmSize: Standard_B2ms
       k8sVersion: ""
       windowsOsSku: ""
-      dependsOn: 'containerize'
+      dependsOn: 'validate1'
 
   - template: singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
     parameters:
@@ -340,7 +340,7 @@ stages:
       vmSize: Standard_B2ms
       k8sVersion: ""
       windowsOsSku: ""
-      dependsOn: 'containerize'
+      dependsOn: 'validate1'
 
   - template: singletenancy/aks-swift/e2e-job-template.yaml
     parameters:
@@ -353,8 +353,7 @@ stages:
       vmSize: Standard_B2s
       k8sVersion: ""
       windowsOsSku: ""
-      osSku: "Ubuntu"
-      dependsOn: 'containerize'
+      dependsOn: 'validate1'
 
   - template: singletenancy/aks/e2e-job-template.yaml
     parameters:
@@ -367,7 +366,7 @@ stages:
       vmSize: Standard_B2s
       k8sVersion: 1.25
       scaleup: 100
-      dependsOn: 'containerize'
+      dependsOn: 'validate1'
 
   - template: singletenancy/aks/e2e-job-template.yaml
     parameters:
@@ -381,7 +380,7 @@ stages:
       windowsOsSku: 'Windows2022'
       os_version: 'ltsc2022'
       scaleup: 50
-      dependsOn: 'containerize'
+      dependsOn: 'validate1'
 
   - stage: validate2
     displayName: Validate Tags

.pipelines/singletenancy/aks-swift/e2e-step-template.yaml

@@ -2,7 +2,6 @@ parameters:
   name: ""
   testDropgz: ""
   clusterName: ""
-  osSku: ""
 
 steps:
   - bash: |

.pipelines/singletenancy/aks/e2e-cluster-template.yaml

@@ -27,8 +27,6 @@ stages:
               inlineScript: |
                 set -e
                 mkdir -p ~/.kube/
-                # echo "Create AKS cluster"
-                # echo "parameters ${{ parameters.windowsOsSku }}"
                 make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
                 make -C ./hack/aks ${{ parameters.clusterType }} AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST) SUB=$(SUB_AZURE_NETWORK_AGENT_TEST) CLUSTER=${{ parameters.clusterName }}-$(make revision) K8S_VER=${{ parameters.k8sVersion }} VM_SIZE=${{ parameters.vmSize }} WINDOWS_OS_SKU=${{ parameters.windowsOsSku }} WINDOWS_VM_SKU=${{ parameters.vmSize }} WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD}
                 echo "Cluster successfully created"

.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml

@@ -149,7 +149,7 @@ steps:
   - script: |
       echo "validate pod IP assignment and check systemd-networkd restart"
       kubectl get pod -owide -A
-      # Deleting echo-external-node deployment until version matches TODO. Upstream TODO has change. - Replace todo with vipul work/PR in upstream
+      # Deleting echo-external-node deployment until cilium version matches TODO. https://github.com/cilium/cilium-cli/issues/67 is addressing the change.
       # Saves 17 minutes
       kubectl delete deploy -n cilium-test echo-external-node
       if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then

.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml

@@ -133,7 +133,7 @@ steps:
   - script: |
       echo "validate pod IP assignment and check systemd-networkd restart"
       kubectl get pod -owide -A
-      # Deleting echo-external-node deployment until version matches TODO. Upstream TODO has change. - Replace todo with vipul work/PR in upstream
+      # Deleting echo-external-node deployment until cilium version matches TODO. https://github.com/cilium/cilium-cli/issues/67 is addressing the change.
       # Saves 17 minutes
       kubectl delete deploy -n cilium-test echo-external-node
       make test-validate-state