From e2295d89e7f9e9976ce42ec7932bd8b6db54ad95 Mon Sep 17 00:00:00 2001
From: jpayne3506 <payne.3506@gmail.com>
Date: Mon, 16 Oct 2023 12:30:11 -0700
Subject: [PATCH] ci: add cilium OS/Proc testing

---
 .../cilium-overlay-load-test-template.yaml    |  6 ++-
 .pipelines/cni/pipeline.yaml                  | 40 +++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml b/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml
index 2e3ac7d657..674bca38ac 100644
--- a/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml
+++ b/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml
@@ -7,6 +7,8 @@ parameters:
   vmSize: "Standard_DS4_v2"
   testDropgz: true
   os: "linux"
+  arch: ""
+  osSKU: Ubuntu
 
 # Condition confirms that:
 # Previous job has reported Succeeded. Previous job is currently setup which controls variable assignment and we are dependent on its success.
@@ -79,9 +81,9 @@ stages:
 
                 echo "Deploy Azure-CNS"
                 if [ -z $(DROP_GZ_VERSION) ]; then
-                  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=$(cnsVersion) CNI_DROPGZ_VERSION=$(dropgzVersion) INSTALL_CNS=true INSTALL_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }} CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
                 else
-                  sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(cnsVersion) CNI_DROPGZ_VERSION=$(DROP_GZ_VERSION) 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=$(cnsVersion) CNI_DROPGZ_VERSION=$(DROP_GZ_VERSION) INSTALL_CNS=true INSTALL_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }} CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
                 fi
                 kubectl get po -owide -A
       - job: deploy_pods
diff --git a/.pipelines/cni/pipeline.yaml b/.pipelines/cni/pipeline.yaml
index d831acb3da..f0355ff998 100644
--- a/.pipelines/cni/pipeline.yaml
+++ b/.pipelines/cni/pipeline.yaml
@@ -142,6 +142,34 @@ stages:
       nodeCount: ${NODE_COUNT_CILIUM}
       vmSize: ${VM_SIZE_CILIUM}
 
+  - template: cilium/cilium-overlay-load-test-template.yaml
+    parameters:
+      name: cilium_overlay_mariner
+      clusterType: overlay-byocni-nokubeproxy-up
+      clusterName: "cil-over-mar"
+      nodeCount: ${NODE_COUNT_CILIUM}
+      vmSize: ${VM_SIZE_CILIUM}
+      arch: amd64
+      osSKU: AzureLinux
+
+  - template: cilium/cilium-overlay-load-test-template.yaml
+    parameters:
+      name: cilium_overlay_arm
+      clusterType: overlay-byocni-nokubeproxy-up
+      clusterName: "cil-over-arm"
+      nodeCount: ${NODE_COUNT_CILIUM}
+      vmSize: Standard_D8ps_v5
+      arch: arm64
+
+  - template: cilium/cilium-overlay-load-test-template.yaml
+    parameters:
+      name: cilium_overlay_rdma
+      clusterType: overlay-byocni-nokubeproxy-up
+      clusterName: "cil-over-rdma"
+      nodeCount: 2
+      vmSize: Standard_NC24r
+      arch: amd64
+
   - template: singletenancy/cniv1-template.yaml
     parameters:
       name: win22_cniv1
@@ -221,6 +249,9 @@ stages:
     condition: always()
     dependsOn:
       - cilium_overlay
+      - cilium_overlay_mariner
+      - cilium_overlay_arm
+      - cilium_overlay_rdma
       - win22_cniv1_HNS
       - linux_cniv1
       - linux_podsubnet
@@ -241,6 +272,15 @@ stages:
             cilium_overlay:
               name: cilium_overlay
               clusterName: "cilium-over"
+            cilium_overlay_mariner:
+              name: cilium_overlay_mariner
+              clusterName: "cil-over-mar"
+            cilium_overlay_arm:
+              name: cilium_overlay_arm
+              clusterName: "cil-over-arm"
+            cilium_overlay_rdma:
+              name: cilium_overlay_rdma
+              clusterName: "cil-over-rdma"
             win22-cniv1:
               name: win22-cniv1
               clusterName: "win22-cniv1"