From 70bab7f5b207a01f8ad05d8201abc0ca1732fc3f Mon Sep 17 00:00:00 2001
From: jpayne3506 <payne.3506@gmail.com>
Date: Tue, 13 Feb 2024 18:16:42 -0800
Subject: [PATCH] ci: k8se2e for aks-swift

---
 .pipelines/pipeline.yaml                      |  2 ++
 .../aks-swift/e2e-job-template.yaml           | 13 ++++++++
 .../aks-swift/e2e-step-template.yaml          | 33 ++-----------------
 3 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
index d58d867fa2..384eba8cf7 100644
--- a/.pipelines/pipeline.yaml
+++ b/.pipelines/pipeline.yaml
@@ -461,6 +461,7 @@ stages:
       parameters:
         name: "aks_swift_e2e"
         displayName: AKS Swift Ubuntu
+        os: linux
         clusterType: swift-byocni-up
         clusterName: "swifte2e"
         vmSize: Standard_B2ms
@@ -472,6 +473,7 @@ stages:
       parameters:
         name: "aks_swift_vnetscale_e2e"
         displayName: AKS Swift Vnet Scale Ubuntu
+        os: linux
         clusterType: vnetscale-swift-byocni-up
         clusterName: "vscaleswifte2e"
         vmSize: Standard_B2ms
diff --git a/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
index 0914aafc47..50257112d9 100644
--- a/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
+++ b/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
@@ -60,10 +60,23 @@ stages:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
 
+      - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
+        parameters:
+          sub: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+          clusterName: ${{ parameters.clusterName }}-$(commitID)
+          os: ${{ parameters.os }}
+          dependsOn: ${{ parameters.name }}
+          datapath: true
+          dns: true
+          portforward: true
+          hostport: true
+          service: true
+
       - job: failedE2ELogs
         displayName: "Failure Logs"
         dependsOn:
           - ${{ parameters.name }}
+          - cni_linux
         condition: failed()
         steps:
           - template: ../../templates/log-template.yaml
diff --git a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
index ddb4c21925..e6bf4b7243 100644
--- a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
+++ b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
@@ -34,18 +34,8 @@ steps:
       inlineScript: |
         set -e
         make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
-        echo "install kubetest2 and gsutils"
-        go get github.com/onsi/ginkgo/ginkgo
-        go get github.com/onsi/gomega/...
-        go install github.com/onsi/ginkgo/ginkgo@latest
-        go install sigs.k8s.io/kubetest2@latest
-        go install sigs.k8s.io/kubetest2/kubetest2-noop@latest
-        go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest
-        wget https://storage.googleapis.com/pub/gsutil.tar.gz
-        tar xfz gsutil.tar.gz
-        sudo mv gsutil /usr/local/bin
-    name: "installKubetest"
-    displayName: "Set up Conformance Tests"
+    name: "kubeconfig"
+    displayName: "Set Kubeconfig"
 
   - script: |
       ls -lah
@@ -57,25 +47,6 @@ steps:
     name: "aksswifte2e"
     displayName: "Run AKS Swift E2E"
 
-  - script: |
-      kubectl get po -owide -A
-      echo "Run Service Conformance E2E"
-      export PATH=${PATH}:/usr/local/bin/gsutil
-      KUBECONFIG=~/.kube/config kubetest2 noop \
-        --test ginkgo -- \
-        --focus-regex "Services.*\[Conformance\].*"
-    name: "servicesConformance"
-    displayName: "Run Services Conformance Tests"
-
-  - script: |
-      echo "Run HostPort Conformance E2E"
-      export PATH=${PATH}:/usr/local/bin/gsutil
-      KUBECONFIG=~/.kube/config kubetest2 noop \
-        --test ginkgo -- \
-        --focus-regex "HostPort.*\[Conformance\].*"
-    name: "hostportConformance"
-    displayName: "Run HostPort Conformance Tests"
-
   - script: |
       echo "Run wireserver and metadata connectivity Tests"
       bash test/network/wireserver_metadata_test.sh