ci: v4overlay conformance test cases (#2274)

v4overlay conformance test cases
Azure · Feb 29, 2024 · 9a4db7d · 9a4db7d
1 parent 46e9a9c
commit 9a4db7d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 29 deletions.
diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
@@ -340,14 +340,15 @@ stages:
 
   - template: singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
     parameters:
-      name: "azure_cni_overlay_e2e"
-      displayName: Azure CNI Overlay
+      name: "azure_overlay_e2e"
+      displayName: Azure Overlay
+      os: linux
       testDropgz: ""
       clusterType: overlay-byocni-up
       clusterName: "azurecnioverlaye2e"
       vmSize: Standard_B2ms
       k8sVersion: ""
-      dependsOn: 'containerize'
+      dependsOn: "containerize"
 
   - template: singletenancy/aks-swift/e2e-job-template.yaml
     parameters:
@@ -392,7 +393,7 @@ stages:
     condition: always()
     dependsOn:
       - setup
-      - "azure_cni_overlay_e2e"
+      - "azure_overlay_e2e"
       - "aks_swift_e2e"
       - "cilium_e2e"
       - "cilium_overlay_cilium_e2e"
@@ -413,8 +414,8 @@ stages:
             cilium_overlay_cilium_e2e:
               name: cilium_overlay_cilium_e2e
               clusterName: 'overlaye2e'
-            azure_cni_overlay_e2e:
-              name: azure_cni_overlay_e2e
+            azure_overlay_e2e:
+              name: azure_overlay_e2e
               clusterName: 'azurecnioverlaye2e'
             aks_swift_e2e:
               name: aks_swift_e2e

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
@@ -57,3 +57,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/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml
@@ -38,20 +38,6 @@ steps:
     name: "kubeconfig"
     displayName: "Set Kubeconfig"
 
-  - script: |
-      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"
-
   - script: |
       echo "Start Integration Tests on Overlay Cluster"
       echo "deploy ip-masq-agent for overlay"
@@ -87,15 +73,6 @@ steps:
       pathtoPublish: "$(Build.ArtifactStagingDirectory)/test-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 wireserver and metadata connectivity Tests"
       bash test/network/wireserver_metadata_test.sh