ci: Replace k8s conformance tests within aks-swift CI (#2590)

ci: k8se2e for aks-swift
Azure · Feb 27, 2024 · fc96dda · fc96dda
1 parent a86f1af
commit fc96dda
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 30 deletions.
diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
@@ -353,6 +353,7 @@ stages:
     parameters:
       name: "aks_swift_e2e"
       displayName: AKS Swift Ubuntu
+      os: linux
       testDropgz: ""
       clusterType: swift-byocni-up
       clusterName: "swifte2e"

diff --git a/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
@@ -60,3 +60,15 @@ stages:
               name: ${{ parameters.name }}
               testDropgz: ${{ parameters.testDropgz }}
               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
diff --git a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
@@ -35,18 +35,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
@@ -75,24 +65,6 @@ steps:
       pathtoPublish: "$(Build.ArtifactStagingDirectory)/aks-swift-output"
     condition: always()
 
-  - script: |
-      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