ci: v4overlay conformance test cases (#2274)

v4overlay conformance test cases
Azure · Oct 5, 2023 · 728dbb3 · 728dbb3
1 parent 7a5cb5e
commit 728dbb3
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 23 deletions.
diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
@@ -379,6 +379,7 @@ stages:
     parameters:
       name: "azure_overlay_e2e"
       displayName: Azure Overlay
+      os: linux
       testDropgz: ""
       clusterType: overlay-byocni-up
       clusterName: "azureoverlaye2e"
@@ -390,6 +391,7 @@ stages:
     parameters:
       name: "azure_overlay_cni_e2e"
       displayName: CNI - Azure Overlay
+      os: linux
       testDropgz: true
       clusterType: overlay-byocni-up
       clusterName: "azureoverlaycnie2e"

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
@@ -60,14 +60,41 @@ stages:
               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 }}
+          dns: true
+          portforward: true
+          hostport: true
+          service: true
+
+      - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
+        parameters:
+          sub: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+          clusterName: ${{ parameters.clusterName }}-$(commitID)
+          os: windows
+          dependsOn: cni_${{ parameters.os }}
+          dns: true
+          portforward: true
+          hostport: true
+          service: true
+          hybridWin: true
+          datapath: true
+
       - job: logs
         displayName: "Log Failure"
         dependsOn:
           - ${{ parameters.name }}
+          - cni_${{ parameters.os }}
+          - cni_windows
         condition: failed()
         steps:
           - template: ../../templates/log-template.yaml
             parameters:
               clusterName: ${{ parameters.clusterName }}-$(commitID)
               os: ${{ parameters.os }}
               cni: cniv2
+
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
@@ -41,20 +41,6 @@ steps:
     name: "installKubectl"
     displayName: "Install Kubectl"
 
-  - 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"
-
   - ${{ if eq( parameters['testDropgz'], true) }}:
       - script: |
           echo "##vso[task.setvariable variable=dropgzVersion]$(make cni-dropgz-test-version)"
@@ -141,15 +127,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