From f9de13e7663556db21a97fdfe4e6844a89550e6d Mon Sep 17 00:00:00 2001
From: Camryn Lee <31013536+camrynl@users.noreply.github.com>
Date: Tue, 29 Jul 2025 15:43:11 -0700
Subject: [PATCH 1/3] ci: build cns in release test pipeline (#3869)

* test build img

* test setup

* add branches to trigger

* add os version to parameterrs in image build

* cleanup changes

* remove os version
---
 .pipelines/cni/pipeline.yaml | 40 ++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/.pipelines/cni/pipeline.yaml b/.pipelines/cni/pipeline.yaml
index 20b0c16a08..dced6f1d3f 100644
--- a/.pipelines/cni/pipeline.yaml
+++ b/.pipelines/cni/pipeline.yaml
@@ -20,7 +20,6 @@ stages:
               go version
               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)"
             name: "SetEnvVars"
             displayName: "Set Environment Variables"
             condition: always()
@@ -63,6 +62,14 @@ stages:
               name: cni
               os: windows
               os_version: ltsc2022
+            cns_linux_amd64:
+              arch: amd64
+              name: cns
+              os: linux
+            cns_windows_amd64:
+              arch: amd64
+              name: cns
+              os: windows
             npm_linux_amd64:
               arch: amd64
               name: npm
@@ -85,18 +92,22 @@ stages:
           name: "$(BUILD_POOL_NAME_LINUX_ARM64)"
         strategy:
           matrix:
-            azure_ipam_linux_arm64:
-              arch: arm64
-              name: azure-ipam
-              os: linux
-            cni_linux_arm64:
-              arch: arm64
-              name: cni
-              os: linux
-            npm_linux_arm64:
-              arch: arm64
-              name: npm
-              os: linux
+              azure_ipam_linux_arm64:
+                arch: arm64
+                name: azure-ipam
+                os: linux
+              cni_linux_arm64:
+                arch: arm64
+                name: cni
+                os: linux
+              cns_linux_arm64:
+                arch: arm64
+                name: cns
+                os: linux
+              npm_linux_arm64:
+                arch: arm64
+                name: npm
+                os: linux
         steps:
           - template: ../containers/container-template.yaml
             parameters:
@@ -154,6 +165,9 @@ stages:
               name: cni
               os_versions: ltsc2019 ltsc2022
               platforms: linux/amd64 linux/arm64 windows/amd64
+            cns:
+              name: cns
+              platforms: linux/amd64 linux/arm64 windows/amd64
             npm:
               name: npm
               os_versions: ltsc2022

From b43a238dc3eba3a1d2fe64484c28ec09f265102c Mon Sep 17 00:00:00 2001
From: Camryn Lee <camrynlee@microsoft.com>
Date: Tue, 2 Sep 2025 17:00:32 +0000
Subject: [PATCH 2/3] add os_versions

---
 .pipelines/cni/pipeline.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.pipelines/cni/pipeline.yaml b/.pipelines/cni/pipeline.yaml
index dced6f1d3f..2467442825 100644
--- a/.pipelines/cni/pipeline.yaml
+++ b/.pipelines/cni/pipeline.yaml
@@ -167,6 +167,7 @@ stages:
               platforms: linux/amd64 linux/arm64 windows/amd64
             cns:
               name: cns
+              os_versions: ltsc2019 ltsc2022
               platforms: linux/amd64 linux/arm64 windows/amd64
             npm:
               name: npm

From 89e7a84df4b7c2bb2004f1910b864378591cbe08 Mon Sep 17 00:00:00 2001
From: Camryn Lee <camrynlee@microsoft.com>
Date: Tue, 2 Sep 2025 17:31:31 +0000
Subject: [PATCH 3/3] update img build

---
 .pipelines/cni/pipeline.yaml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.pipelines/cni/pipeline.yaml b/.pipelines/cni/pipeline.yaml
index 2467442825..931efb3771 100644
--- a/.pipelines/cni/pipeline.yaml
+++ b/.pipelines/cni/pipeline.yaml
@@ -62,14 +62,20 @@ stages:
               name: cni
               os: windows
               os_version: ltsc2022
+            cns_windows2019_amd64:
+              arch: amd64
+              name: cns
+              os: windows
+              os_version: ltsc2019
             cns_linux_amd64:
               arch: amd64
               name: cns
               os: linux
-            cns_windows_amd64:
+            cns_windows2022_amd64:
               arch: amd64
               name: cns
               os: windows
+              os_version: ltsc2022
             npm_linux_amd64:
               arch: amd64
               name: npm