ci: Enable dropgz-test in PR pipeline (#2116)

jpayne3506 · web-flow · commit bad286b602aa · 2023-09-20T01:40:51.000Z
diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
@@ -5,22 +5,22 @@ pr:
       - release/*
   paths:
     exclude:
-    - ".devcontainer"
-    - ".hooks"
-    - ".vscode"
-    - ".github"
-    - docs
+      - ".devcontainer"
+      - ".hooks"
+      - ".vscode"
+      - ".github"
+      - docs
 
 trigger:
   paths:
     exclude:
-    - docs
-    - "zapai/*"
-    - "azure-ipam/*"
-    - "dropgz/*"
+      - docs
+      - "zapai/*"
+      - "azure-ipam/*"
+      - "dropgz/*"
   tags:
     include:
-    - "*"
+      - "*"
 
 stages:
   - stage: setup
@@ -328,6 +328,7 @@ stages:
             displayName: "Set current tag variable"
             condition: always()
 
+  # Cilium Podsubnet E2E tests
   - template: singletenancy/cilium/cilium-e2e-job-template.yaml
     parameters:
       name: "cilium_e2e"
@@ -337,30 +338,68 @@ stages:
       clusterName: "ciliume2e"
       vmSize: Standard_B2ms
       k8sVersion: ""
-      dependsOn: 'containerize'
+      dependsOn: "containerize"
 
+  - template: singletenancy/cilium/cilium-e2e-job-template.yaml
+    parameters:
+      name: "cilium_podsubnet_cni_e2e"
+      displayName: CNI - Cilium Podsubnet
+      testDropgz: true
+      clusterType: swift-byocni-nokubeproxy-up
+      clusterName: "ciliumpodsubnetcnie2e"
+      vmSize: Standard_B2ms
+      k8sVersion: ""
+      windowsOsSku: ""
+      dependsOn: "containerize"
+
+  # Cilium Overlay E2E tests
   - template: singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
     parameters:
-      name: "cilium_overlay_cilium_e2e"
+      name: "cilium_overlay_e2e"
       displayName: Cilium on AKS Overlay
       testDropgz: ""
       clusterType: overlay-byocni-nokubeproxy-up
-      clusterName: "overlaye2e"
+      clusterName: "ciliumoverlaye2e"
       vmSize: Standard_B2ms
       k8sVersion: ""
-      dependsOn: 'containerize'
+      dependsOn: "containerize"
 
+  - template: singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
+    parameters:
+      name: "cilium_overlay_cni_e2e"
+      displayName: CNI - Cilium on AKS Overlay
+      testDropgz: true
+      clusterType: overlay-byocni-nokubeproxy-up
+      clusterName: "ciliumoverlaycnie2e"
+      vmSize: Standard_B2ms
+      k8sVersion: ""
+      windowsOsSku: ""
+      dependsOn: "containerize"
+
+  # Azure Overlay E2E tests
   - 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
       testDropgz: ""
       clusterType: overlay-byocni-up
-      clusterName: "azurecnioverlaye2e"
+      clusterName: "azureoverlaye2e"
       vmSize: Standard_B2ms
       k8sVersion: ""
-      dependsOn: 'containerize'
+      dependsOn: "containerize"
 
+  - template: singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
+    parameters:
+      name: "azure_overlay_cni_e2e"
+      displayName: CNI - Azure Overlay
+      testDropgz: true
+      clusterType: overlay-byocni-up
+      clusterName: "azureoverlaycnie2e"
+      vmSize: Standard_B2ms
+      k8sVersion: ""
+      dependsOn: "containerize"
+
+  # AKS Swift E2E tests
   - template: singletenancy/aks-swift/e2e-job-template.yaml
     parameters:
       name: "aks_swift_e2e"
@@ -370,20 +409,33 @@ stages:
       clusterName: "swifte2e"
       vmSize: Standard_B2s
       k8sVersion: ""
-      dependsOn: 'containerize'
+      dependsOn: "containerize"
+
+  - template: singletenancy/aks-swift/e2e-job-template.yaml
+    parameters:
+      name: "aks_swift_cni_e2e"
+      displayName: CNI - AKS Swift
+      testDropgz: true
+      clusterType: swift-byocni-up
+      clusterName: "swiftcnie2e"
+      vmSize: Standard_B2ms
+      k8sVersion: ""
+      windowsOsSku: ""
+      dependsOn: "containerize"
 
+  # CNIv1 E2E tests
   - template: singletenancy/aks/e2e-job-template.yaml
     parameters:
       name: "aks_ubuntu_22_linux_e2e"
       displayName: AKS Ubuntu 22
-      arch: 'amd64'
-      os: 'linux'
+      arch: "amd64"
+      os: "linux"
       clusterType: linux-cniv1-up
-      clusterName: 'ubuntu22e2e'
+      clusterName: "ubuntu22e2e"
       vmSize: Standard_B2s
       k8sVersion: 1.25
       scaleup: 100
-      dependsOn: 'containerize'
+      dependsOn: "containerize"
 
   - template: singletenancy/aks/e2e-job-template.yaml
     parameters:
@@ -392,12 +444,13 @@ stages:
       arch: amd64
       os: windows
       clusterType: windows-cniv1-up
-      clusterName: 'win22e2e'
+      clusterName: "win22e2e"
       vmSize: Standard_B2ms
-      os_version: 'ltsc2022'
+      os_version: "ltsc2022"
       scaleup: 50
-      dependsOn: 'containerize'
+      dependsOn: "containerize"
 
+  # CNI dual stack overlay E2E tests
   - template: singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
     parameters:
       name: "dualstackoverlay_e2e"
@@ -406,18 +459,22 @@ stages:
       clusterType: dualstack-overlay-byocni-up
       clusterName: "dualstackoverlaye2e"
       vmSize: Standard_B2ms
-      dependsOn: 'containerize'
+      dependsOn: "containerize"
       testDropgz: true
 
   - stage: delete
     displayName: Delete Clusters
     condition: always()
     dependsOn:
       - setup
-      - "azure_cni_overlay_e2e"
+      - "azure_overlay_e2e"
+      - "azure_overlay_cni_e2e"
       - "aks_swift_e2e"
+      - "aks_swift_cni_e2e"
       - "cilium_e2e"
-      - "cilium_overlay_cilium_e2e"
+      - "cilium_podsubnet_cni_e2e"
+      - "cilium_overlay_e2e"
+      - "cilium_overlay_cni_e2e"
       - "aks_ubuntu_22_linux_e2e"
       - "aks_windows_22_e2e"
       - "dualstackoverlay_e2e"
@@ -432,25 +489,37 @@ stages:
           matrix:
             cilium_e2e:
               name: cilium_e2e
-              clusterName: 'ciliume2e'
-            cilium_overlay_cilium_e2e:
-              name: cilium_overlay_cilium_e2e
-              clusterName: 'overlaye2e'
-            azure_cni_overlay_e2e:
-              name: azure_cni_overlay_e2e
-              clusterName: 'azurecnioverlaye2e'
+              clusterName: "ciliume2e"
+            cilium_overlay_e2e:
+              name: cilium_overlay_e2e
+              clusterName: "ciliumoverlaye2e"
+            azure_overlay_e2e:
+              name: azure_overlay_e2e
+              clusterName: "azureoverlaye2e"
             aks_swift_e2e:
               name: aks_swift_e2e
-              clusterName: 'swifte2e'
+              clusterName: "swifte2e"
+            azure_overlay_cni_e2e:
+              name: azure_overlay_cni_e2e
+              clusterName: "azureoverlaycnie2e"
+            cilium_podsubnet_cni_e2e:
+              name: cilium_podsubnet_cni_e2e
+              clusterName: "ciliumpodsubnetcnie2e"
+            cilium_overlay_cni_e2e:
+              name: cilium_overlay_cni_e2e
+              clusterName: "ciliumoverlaycnie2e"
+            aks_swift_cni_e2e:
+              name: aks_swift_cni_e2e
+              clusterName: "swiftcnie2e"
             aks_ubuntu_22_linux_e2e:
               name: aks_ubuntu_22_linux_e2e
-              clusterName: 'ubuntu22e2e'
+              clusterName: "ubuntu22e2e"
             aks_windows_22_e2e:
               name: aks_windows_22_e2e
-              clusterName: 'win22e2e'
+              clusterName: "win22e2e"
             dualstackoverlay_e2e:
               name: dualstackoverlay_e2e
-              clusterName: 'dualstackoverlaye2e'
+              clusterName: "dualstackoverlaye2e"
         steps:
           - template: templates/delete-cluster.yaml
             parameters:
@@ -481,13 +550,18 @@ stages:
   - stage: cleanup
     displayName: Cleanup
     dependsOn:
-      - "azure_cni_overlay_e2e"
+      - "azure_overlay_e2e"
+      - "azure_overlay_cni_e2e"
       - "aks_swift_e2e"
+      - "aks_swift_cni_e2e"
       - "cilium_e2e"
-      - "cilium_overlay_cilium_e2e"
+      - "cilium_podsubnet_cni_e2e"
+      - "cilium_overlay_e2e"
+      - "cilium_overlay_cni_e2e"
       - "aks_ubuntu_22_linux_e2e"
       - "aks_windows_22_e2e"
       - "dualstackoverlay_e2e"
+
     jobs:
       - job: delete_remote_artifacts
         displayName: Delete remote artifacts
diff --git a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
@@ -44,6 +44,17 @@ steps:
     name: "installKubetest"
     displayName: "Set up Conformance Tests"
 
+  - ${{ if eq( parameters['testDropgz'], true) }}:
+      - script: |
+          echo "##vso[task.setvariable variable=dropgzVersion]$(make cni-dropgz-test-version)"
+        name: dropgzTestVersion
+        displayName: "Dropgz Test Version"
+  - ${{ else }}:
+      - script: |
+          echo "##vso[task.setvariable variable=dropgzVersion]$(make cni-dropgz-version)"
+        name: dropgzVersion
+        displayName: "Dropgz Version"
+
   - script: |
       ls -lah
       pwd
@@ -52,7 +63,7 @@ steps:
       sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
       kubectl cluster-info
       kubectl get po -owide -A
-      sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_DROPGZ_VERSION=$(make cni-dropgz-version) INSTALL_CNS=true INSTALL_AZURE_VNET=true TEST_DROPGZ=${{ parameters.testDropgz }}
+      sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_DROPGZ_VERSION=$(dropgzVersion) INSTALL_CNS=true INSTALL_AZURE_VNET=true TEST_DROPGZ=${{ parameters.testDropgz }}
     retryCountOnTaskFailure: 3
     name: "aksswifte2e"
     displayName: "Run AKS Swift E2E"
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
@@ -55,6 +55,17 @@ steps:
     name: "installKubetest"
     displayName: "Set up Conformance Tests"
 
+  - ${{ if eq( parameters['testDropgz'], true) }}:
+      - script: |
+          echo "##vso[task.setvariable variable=dropgzVersion]$(make cni-dropgz-test-version)"
+        name: dropgzTestVersion
+        displayName: "Dropgz Test Version"
+  - ${{ else }}:
+      - script: |
+          echo "##vso[task.setvariable variable=dropgzVersion]$(make cni-dropgz-version)"
+        name: dropgzVersion
+        displayName: "Dropgz Version"
+
   - script: |
       echo "Start Integration Tests on Overlay Cluster"
       echo "deploy ip-masq-agent for overlay"
@@ -65,7 +76,7 @@ steps:
       cd ../../../..
       kubectl get po -owide -A
       CNS=$(make cns-version) DROPGZ=$(make cni-dropgz-version)
-      sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=${CNS} CNI_DROPGZ_VERSION=${DROPGZ} INSTALL_CNS=true INSTALL_AZURE_CNI_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }}
+      sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=${CNS} CNI_DROPGZ_VERSION=$(dropgzVersion) INSTALL_CNS=true INSTALL_AZURE_CNI_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }}
     retryCountOnTaskFailure: 3
     name: "integrationTest"
     displayName: "Run CNS Integration Tests on AKS Overlay"
diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
@@ -80,6 +80,17 @@ steps:
     name: "installKubetest"
     displayName: "Set up Conformance Tests"
 
+  - ${{ if eq( parameters['testDropgz'], true) }}:
+      - script: |
+          echo "##vso[task.setvariable variable=dropgzVersion]$(make cni-dropgz-test-version)"
+        name: dropgzTestVersion
+        displayName: "Dropgz Test Version"
+  - ${{ else }}:
+      - script: |
+          echo "##vso[task.setvariable variable=dropgzVersion]$(make cni-dropgz-version)"
+        name: dropgzVersion
+        displayName: "Dropgz Version"
+
   - script: |
       echo "Start Azilium E2E Tests on Overlay Cluster"
       echo "deploy ip-masq-agent for overlay"
@@ -94,7 +105,7 @@ steps:
       then
           CNS=$(CNS_VERSION) DROPGZ=$(DROP_GZ_VERSION) && echo "Running nightly"
       else
-          CNS=$(make cns-version) DROPGZ=$(make cni-dropgz-version)
+          CNS=$(make cns-version) DROPGZ=$(dropgzVersion)
       fi
       sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=${CNS} CNI_DROPGZ_VERSION=${DROPGZ} INSTALL_CNS=true INSTALL_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }}
     retryCountOnTaskFailure: 3
@@ -221,4 +232,3 @@ steps:
     name: "Cleanupartifactdir"
     displayName: "Cleanup artifact dir"
     condition: always()
-
diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
@@ -77,10 +77,21 @@ steps:
     name: "installKubetest"
     displayName: "Set up Conformance Tests"
 
+  - ${{ if eq( parameters['testDropgz'], true) }}:
+      - script: |
+          echo "##vso[task.setvariable variable=dropgzVersion]$(make cni-dropgz-test-version)"
+        name: dropgzTestVersion
+        displayName: "Dropgz Test Version"
+  - ${{ else }}:
+      - script: |
+          echo "##vso[task.setvariable variable=dropgzVersion]$(make cni-dropgz-version)"
+        name: dropgzVersion
+        displayName: "Dropgz Version"
+
   - script: |
       echo "Start Azilium E2E Tests"
       kubectl get po -owide -A
-      sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_DROPGZ_VERSION=$(make cni-dropgz-version) INSTALL_CNS=true INSTALL_AZILIUM=true TEST_DROPGZ=${{ parameters.testDropgz }}
+      sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_DROPGZ_VERSION=$(dropgzVersion) INSTALL_CNS=true INSTALL_AZILIUM=true TEST_DROPGZ=${{ parameters.testDropgz }}
     retryCountOnTaskFailure: 3
     name: "aziliumTest"
     displayName: "Run Azilium E2E"
