From f03495cbe7ae7cd26a34c9177618a176e108190c Mon Sep 17 00:00:00 2001
From: yijingyan2 <yijingyan@microsoft.com>
Date: Wed, 24 Dec 2025 03:00:09 +0000
Subject: [PATCH] update docker slave name

Signed-off-by: yijingyan2 <yijingyan@microsoft.com>
---
 .azure-pipelines/build-template.yml |  5 +----
 azure-pipelines.yml                 | 11 ++++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
index 4cfa93870..d67409d52 100644
--- a/.azure-pipelines/build-template.yml
+++ b/.azure-pipelines/build-template.yml
@@ -25,9 +25,6 @@ parameters:
   type: number
   default: 180
 
-- name: sonic_slave
-  type: string
-
 - name: old_artifact_name
   type: string
 
@@ -51,7 +48,7 @@ jobs:
   timeoutInMinutes: ${{ parameters.timeout }}
 
   container:
-    image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:master
+    image: sonicdev-microsoft.azurecr.io:443/sonic-slave-trixie:$(BUILD_BRANCH)-${{ parameters.arch }}
 
   steps:
   - checkout: self
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ea2d932ba..205ce2cb6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,6 +7,12 @@ trigger:
   branches:
     include:
       - "*"
+variables:
+  - name: BUILD_BRANCH
+    ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+      value: $(System.PullRequest.TargetBranch)
+    ${{ else }}:
+      value: $(Build.SourceBranchName)
 
 stages:
 - stage: Build
@@ -16,7 +22,6 @@ stages:
     parameters:
       arch: amd64
       pool: sonicso1ES-amd64
-      sonic_slave: sonic-slave-trixie
       old_artifact_name: sonic-linux-kernel
       artifact_name: sonic-linux-kernel.amd64
       old_linux_deb_pattern: linux-image-*-unsigned_*deb
@@ -26,7 +31,6 @@ stages:
     parameters:
       arch: amd64
       pool: sonicso1ES-amd64
-      sonic_slave: sonic-slave-trixie
       old_artifact_name: sonic-linux-kernel
       artifact_name: sonic-linux-kernel.amd64.secure
       old_linux_deb_pattern: linux-image-*-unsigned_*deb
@@ -37,7 +41,6 @@ stages:
     parameters:
       arch: arm64
       pool: sonicso1ES-arm64
-      sonic_slave: sonic-slave-trixie-arm64
       old_artifact_name: sonic-linux-kernel.arm64
       artifact_name: sonic-linux-kernel.arm64
       old_linux_deb_pattern: linux-image-*-unsigned_*deb
@@ -47,7 +50,6 @@ stages:
     parameters:
       arch: armhf
       pool: sonicso1ES-armhf
-      sonic_slave: sonic-slave-trixie-armhf
       old_artifact_name: sonic-linux-kernel.armhf
       artifact_name: sonic-linux-kernel.armhf
       old_linux_deb_pattern: linux-image-*-armmp_*deb
@@ -58,7 +60,6 @@ stages:
       arch: arm64
       platform: pensando
       pool: sonicso1ES-arm64
-      sonic_slave: sonic-slave-trixie-arm64
       old_artifact_name: sonic-linux-kernel.pensando.arm64
       artifact_name: sonic-linux-kernel.pensando.arm64
       old_linux_deb_pattern: linux-image-*-unsigned_*deb