From 3391969d2e3560ee2c73b617bf7332470c1c2b71 Mon Sep 17 00:00:00 2001
From: xumia <59720581+xumia@users.noreply.github.com>
Date: Wed, 6 Apr 2022 11:34:02 +0800
Subject: [PATCH] [Ci]: Fix the docker slave azp template issue (#10453)

Why I did it
[Ci]: Fix the docker slave azp template issue
---
 .azure-pipelines/docker-sonic-slave-template.yml | 5 +++--
 .azure-pipelines/docker-sonic-slave.yml          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.azure-pipelines/docker-sonic-slave-template.yml b/.azure-pipelines/docker-sonic-slave-template.yml
index 2a9421dda3..ac5eb9a347 100644
--- a/.azure-pipelines/docker-sonic-slave-template.yml
+++ b/.azure-pipelines/docker-sonic-slave-template.yml
@@ -40,7 +40,7 @@ jobs:
   - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
     - template: template-clean-sonic-slave.yml
   - ${{ else }}:
-    - template: .azure-pipelines/template-variables.yml@buildimage
+    - template: '/.azure-pipelines/template-clean-sonic-slave.yml@buildimage'
   - checkout: self
     clean: true
     submodules: recursive
@@ -103,7 +103,8 @@ jobs:
       command: push
       tags: |
         $(VARIABLE_SLAVE_BASE_TAG)
-        latest
+        ${{ if eq(variables['Build.SourceBranchName'], 'master') }}:
+          latest
   - ${{ if ne(parameters.arch, 'amd64') }}:
     - task: Docker@2
       condition: ne(variables['Build.Reason'], 'PullRequest')
diff --git a/.azure-pipelines/docker-sonic-slave.yml b/.azure-pipelines/docker-sonic-slave.yml
index a6a9750a38..7b812b8a43 100644
--- a/.azure-pipelines/docker-sonic-slave.yml
+++ b/.azure-pipelines/docker-sonic-slave.yml
@@ -67,7 +67,7 @@ stages:
               arch: ${{ arch }}
               dist: ${{ dist }}
         - ${{ else }}:
-          - template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
+          - template: '/.azure-pipelines/docker-sonic-slave-template.yml@buildimage'
             parameters:
               pool: sonicbld
               arch: ${{ arch }}