chore: migrate to azure-cni and azure-ipam from dropgz-test

.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml

@@ -5,7 +5,6 @@ parameters:
   clusterName: "cilium-overlay"
   nodeCount: 10
   vmSize: "Standard_DS4_v2"
-  testDropgz: true
   os: "linux"
   arch: ""
   osSKU: Ubuntu
@@ -42,7 +41,6 @@ stages:
     variables:
       commitID: $[ stagedependencies.setup.env.outputs['SetEnvVars.commitID'] ]
       cnsVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.cnsVersion'] ]
-      dropgzVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.dropgzVersion'] ]
     pool:
       name: "$(BUILD_POOL_NAME_DEFAULT)"
     dependsOn:
@@ -80,7 +78,7 @@ stages:
                 kubectl get po -owide -A
 
                 echo "Deploy Azure-CNS"
-                sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(cnsVersion) CNI_DROPGZ_VERSION=$(dropgzVersion) INSTALL_CNS=true INSTALL_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }} CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
+                sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=$(make azure-ipam-version) CNS_VERSION=$(make cns-version) INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
                 kubectl get po -owide -A
       - job: deploy_pods
         condition: and( and( not(canceled()), not(failed()) ), or( contains(variables.CONTROL_SCENARIO, 'scaleTest') , contains(variables.CONTROL_SCENARIO, 'all') ) )

.pipelines/cni/cilium/nightly-release-test.yml

@@ -86,7 +86,6 @@ stages:
         - template: ../../singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
           parameters:
             name: "cilium_nightly"
-            testDropgz: ""
             clusterName: ciliumnightly-$(commitID)
             testHubble: true
       - job: logs

.pipelines/cni/pipeline.yaml

@@ -16,12 +16,6 @@ stages:
               echo "##vso[task.setvariable variable=commitID;isOutput=true]$(echo $(make revision)-$(date "+%d%H%M"))"
               echo "##vso[task.setvariable variable=npmVersion;isOutput=true]$(make npm-version)"
               echo "##vso[task.setvariable variable=cnsVersion;isOutput=true]$(CNS_VERSION)"
-
-              if [ -z $(DROP_GZ_VERSION) ]; then
-                echo "##vso[task.setvariable variable=dropgzVersion;isOutput=true]$(make cni-dropgz-test-version)"
-              else
-                echo "##vso[task.setvariable variable=dropgzVersion;isOutput=true]$(DROP_GZ_VERSION)"
-              fi
             name: "SetEnvVars"
             displayName: "Set Environment Variables"
             condition: always()
@@ -36,13 +30,22 @@ stages:
           name: "$(BUILD_POOL_NAME_LINUX_AMD64)"
         strategy:
           matrix:
-            cni_dropgz_test_linux_amd64:
+            azure_ipam_linux_amd64:
               arch: amd64
-              name: cni-dropgz-test
+              name: azure-ipam
               os: linux
-            cni_dropgz_test_windows2022_amd64:
+            azure_ipam_windows2022_amd64:
               arch: amd64
-              name: cni-dropgz-test
+              name: azure-ipam
+              os: windows
+              os_version: ltsc2022
+            cni_linux_amd64:
+              arch: amd64
+              name: cni
+              os: linux
+            cni_windows2022_amd64:
+              arch: amd64
+              name: cni
               os: windows
               os_version: ltsc2022
             npm_linux_amd64:
@@ -67,9 +70,13 @@ stages:
           name: "$(BUILD_POOL_NAME_LINUX_ARM64)"
         strategy:
           matrix:
-            cni_dropgz_test_linux_arm64:
+            azure_ipam_linux_arm64:
+              arch: arm64
+              name: azure-ipam
+              os: linux
+            cni_linux_arm64:
               arch: arm64
-              name: cni-dropgz-test
+              name: cni
               os: linux
             npm_linux_arm64:
               arch: arm64
@@ -125,8 +132,11 @@ stages:
           name: "$(BUILD_POOL_NAME_DEFAULT)"
         strategy:
           matrix:
-            cni_dropgz_test:
-              name: cni-dropgz-test
+            azure-ipam:
+              name: azure-ipam
+              platforms: linux/amd64 linux/arm64 windows/amd64
+            cni:
+              name: cni
               platforms: linux/amd64 linux/arm64 windows/amd64
             npm:
               name: npm

.pipelines/cni/singletenancy/cniv1-template.yaml

@@ -87,7 +87,6 @@ stages:
     variables:
       commitID: $[ stagedependencies.setup.env.outputs['SetEnvVars.commitID'] ]
       npmVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.npmVersion'] ]
-      dropgzVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.dropgzVersion'] ]
     pool:
       name: $(BUILD_POOL_NAME_DEFAULT)
     dependsOn:
@@ -110,24 +109,24 @@ stages:
                 echo "Upload CNI"
                 echo "Deploying on Linux nodes"
                 if [ "${{parameters.os}}" == "windows" ]; then
-                  export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS='linux' ARCH=${{ parameters.arch }} CNI_DROPGZ_TEST_VERSION=$(dropgzVersion))
-                  echo "Dropgz image: $DROP_GZ_URL"
+                  export CNI_IMAGE=$(make cni-image-name-and-tag OS='linux' ARCH=${{ parameters.arch }} CNI_VERSION=$(make cni-version))
+                  echo "CNI image: $CNI_IMAGE"
                   envsubst < ./test/integration/manifests/cni/cni-installer-v1.yaml | kubectl apply -f -
                   kubectl rollout status daemonset/azure-cni -n kube-system
                   echo "Deploying on windows nodes"
-                  export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS='windows' ARCH=${{ parameters.arch }}  OS_VERSION=${{ parameters.os_version }} CNI_DROPGZ_TEST_VERSION=$(dropgzVersion))
-                  echo "Dropgz image: $DROP_GZ_URL"
+                  export CNI_IMAGE=$(make cni-image-name-and-tag OS='windows' ARCH=${{ parameters.arch }}  OS_VERSION=${{ parameters.os_version }} CNI_VERSION=$(make cni-version))
+                  echo "CNI image: $CNI_IMAGE"
                   envsubst < ./test/integration/manifests/cni/cni-installer-v1-windows.yaml | kubectl apply -f -
                   kubectl rollout status daemonset/azure-cni-windows -n kube-system
                 else
-                  export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS=${{ parameters.os }} ARCH=${{ parameters.arch }} CNI_DROPGZ_TEST_VERSION=$(dropgzVersion))
-                  echo "Dropgz image: $DROP_GZ_URL"
+                  export CNI_IMAGE=$(make cni-image-name-and-tag OS=${{ parameters.os }} ARCH=${{ parameters.arch }} CNI_VERSION=$(make cni-version))
+                  echo "CNI image: $CNI_IMAGE"
                   envsubst < ./test/integration/manifests/cni/cni-installer-v1.yaml | kubectl apply -f -
                   kubectl rollout status daemonset/azure-cni -n kube-system
                 fi
                 kubectl get pods -A -owide
-            name: "UploadCNI"
-            displayName: "Upload CNI"
+            name: "deployCNI"
+            displayName: "Deploy CNI"
       - template: ../../npm/npm-cni-integration-test.yaml
         parameters:
           clusterName: ${{ parameters.clusterName }}-$(commitID)
@@ -227,7 +226,6 @@ stages:
       variables:
         commitID: $[ stagedependencies.setup.env.outputs['SetEnvVars.commitID'] ]
         npmVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.npmVersion'] ]
-        dropgzVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.dropgzVersion'] ]
       pool:
         name: $(BUILD_POOL_NAME_DEFAULT)
       dependsOn:

.pipelines/cni/singletenancy/linux-cniv2-template.yaml

@@ -7,7 +7,6 @@ parameters:
   vmSize: ""
   os: linux
   arch: ""
-  testDropgz: true
   osSKU: Ubuntu
 
 # CNIv2
@@ -80,7 +79,6 @@ stages:
   - stage: ${{ parameters.name }}
     variables:
       commitID: $[ stagedependencies.setup.env.outputs['SetEnvVars.commitID'] ]
-      dropgzVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.dropgzVersion'] ]
       cnsVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.cnsVersion'] ]
       npmVersion: $[ stagedependencies.setup.env.outputs['SetEnvVars.npmVersion'] ]
     pool:
@@ -106,7 +104,7 @@ stages:
                   make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
                   kubectl cluster-info
                   kubectl get po -owide -A
-                  sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(cnsVersion) CNI_DROPGZ_VERSION=$(dropgzVersion) INSTALL_CNS=true INSTALL_AZURE_CNI_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }} CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
+                  sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_VERSION=$(make cni-version) INSTALL_CNS=true INSTALL_AZURE_CNI_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
               name: "overlaye2e"
               displayName: "Overlay Integration"
           - ${{ if contains(parameters.clusterType, 'swift') }}:
@@ -121,7 +119,7 @@ stages:
                   make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
                   kubectl cluster-info
                   kubectl get po -owide -A
-                  sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(cnsVersion) CNI_DROPGZ_VERSION=$(dropgzVersion) INSTALL_CNS=true INSTALL_AZURE_VNET=true TEST_DROPGZ=${{ parameters.testDropgz }} CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
+                  sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_VERSION=$(make cni-version) INSTALL_CNS=true INSTALL_AZURE_VNET=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
               name: "swifte2e"
               displayName: "Swift Integration"
       - template: ../../npm/npm-cni-integration-test.yaml