From bb4e5579a83dbcb2f2cae15e5ad0bf5f159950fe Mon Sep 17 00:00:00 2001
From: Camryn Lee <camrynlee@microsoft.com>
Date: Fri, 25 Jul 2025 16:47:20 +0000
Subject: [PATCH 1/6] test build img

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

diff --git a/.pipelines/cni/pipeline.yaml b/.pipelines/cni/pipeline.yaml
index 66ff3d1087..bc2abb1e0d 100644
--- a/.pipelines/cni/pipeline.yaml
+++ b/.pipelines/cni/pipeline.yaml
@@ -24,7 +24,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()
@@ -55,6 +54,14 @@ stages:
               arch: amd64
               name: cni
               os: windows
+            cns_linux_amd64:
+              arch: amd64
+              name: cns
+              os: linux
+            cns_windows_amd64:
+              arch: amd64
+              name: cns
+              os: windows
             ipv6_hp_bpf_linux_amd64:
               arch: amd64
               name: ipv6-hp-bpf
@@ -87,6 +94,10 @@ stages:
                 arch: arm64
                 name: cni
                 os: linux
+              cns_linux_arm64:
+                arch: arm64
+                name: cns
+                os: linux
               ipv6_hp_bpf_linux_arm64:
                 arch: arm64
                 name: ipv6-hp-bpf
@@ -151,6 +162,9 @@ stages:
             cni:
               name: cni
               platforms: linux/amd64 linux/arm64 windows/amd64
+            cns:
+              name: cns
+              platforms: linux/amd64 linux/arm64 windows/amd64
             ipv6-hp-bpf:
               name: ipv6-hp-bpf
               platforms: linux/amd64 linux/arm64

From 1dca8ec73a56628f65652d0f61b9c7437a342e56 Mon Sep 17 00:00:00 2001
From: Camryn Lee <camrynlee@microsoft.com>
Date: Fri, 25 Jul 2025 23:02:24 +0000
Subject: [PATCH 2/6] test setup

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

diff --git a/.pipelines/cni/pipeline.yaml b/.pipelines/cni/pipeline.yaml
index bc2abb1e0d..6034a7df35 100644
--- a/.pipelines/cni/pipeline.yaml
+++ b/.pipelines/cni/pipeline.yaml
@@ -24,6 +24,7 @@ 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=Tag;isOutput=true]$(make version)"
             name: "SetEnvVars"
             displayName: "Set Environment Variables"
             condition: always()

From b94015390b483ceaf8f06319c27b0259441c2e08 Mon Sep 17 00:00:00 2001
From: Camryn Lee <camrynlee@microsoft.com>
Date: Fri, 25 Jul 2025 23:44:18 +0000
Subject: [PATCH 3/6] add branches to trigger

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

diff --git a/.pipelines/cni/pipeline.yaml b/.pipelines/cni/pipeline.yaml
index 6034a7df35..aeaf15f9c9 100644
--- a/.pipelines/cni/pipeline.yaml
+++ b/.pipelines/cni/pipeline.yaml
@@ -5,6 +5,10 @@ trigger:
     - dropgz/*
     - azure-ipam/*
     - v*
+  branches:
+    include:
+    - master
+    - release/*
 parameters:
   - name: upgradeScenario
     type: boolean

From 016f29152c520495fb74f9206cba0d74cacd7ce5 Mon Sep 17 00:00:00 2001
From: Camryn Lee <camrynlee@microsoft.com>
Date: Mon, 28 Jul 2025 21:17:32 +0000
Subject: [PATCH 4/6] add os version to parameterrs in image build

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

diff --git a/.pipelines/cni/pipeline.yaml b/.pipelines/cni/pipeline.yaml
index aeaf15f9c9..df0f887cdf 100644
--- a/.pipelines/cni/pipeline.yaml
+++ b/.pipelines/cni/pipeline.yaml
@@ -117,6 +117,7 @@ stages:
               arch: $(arch)
               name: $(name)
               os: $(os)
+              os_version: $(os_version)
               
   - stage: binaries
     displayName: Build Binaries

From 51658008ff110d226013a03c88908057e4eb6895 Mon Sep 17 00:00:00 2001
From: Camryn Lee <camrynlee@microsoft.com>
Date: Tue, 29 Jul 2025 20:35:27 +0000
Subject: [PATCH 5/6] cleanup changes

---
 .pipelines/cni/pipeline.yaml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.pipelines/cni/pipeline.yaml b/.pipelines/cni/pipeline.yaml
index df0f887cdf..8d44a46a80 100644
--- a/.pipelines/cni/pipeline.yaml
+++ b/.pipelines/cni/pipeline.yaml
@@ -5,10 +5,6 @@ trigger:
     - dropgz/*
     - azure-ipam/*
     - v*
-  branches:
-    include:
-    - master
-    - release/*
 parameters:
   - name: upgradeScenario
     type: boolean
@@ -28,7 +24,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=Tag;isOutput=true]$(make version)"
             name: "SetEnvVars"
             displayName: "Set Environment Variables"
             condition: always()

From 539cc8672567b79fbc7edfb30aebfba81237d41d Mon Sep 17 00:00:00 2001
From: Camryn Lee <camrynlee@microsoft.com>
Date: Tue, 29 Jul 2025 21:17:25 +0000
Subject: [PATCH 6/6] remove os version

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

diff --git a/.pipelines/cni/pipeline.yaml b/.pipelines/cni/pipeline.yaml
index 8d44a46a80..bc2abb1e0d 100644
--- a/.pipelines/cni/pipeline.yaml
+++ b/.pipelines/cni/pipeline.yaml
@@ -112,7 +112,6 @@ stages:
               arch: $(arch)
               name: $(name)
               os: $(os)
-              os_version: $(os_version)
               
   - stage: binaries
     displayName: Build Binaries