From 11c410178754568734e44b1f9dc03e474a2a83cc Mon Sep 17 00:00:00 2001
From: shilongliu <shilongliu@microsoft.com>
Date: Fri, 25 Mar 2022 13:04:00 +0800
Subject: [PATCH] fix

---
 .azure-pipelines/azure-pipelines-UpgrateVersion.yml | 12 ++++++++++--
 .azure-pipelines/template-clean-sonic-slave.yml     |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
index 638802dbf7f3..62513208a02a 100644
--- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
+++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml
@@ -18,6 +18,14 @@ schedules:
     - 202006
   always: true
 
+resources:
+  repositories:
+  - repository: buildimage
+    type: github
+    name: Azure/sonic-buildimage
+    ref: master
+    endpoint: build
+
 pool: sonicbld
 
 parameters:
@@ -41,14 +49,14 @@ stages:
       value: none
     - name: VERSION_CONTROL_OPTIONS
       value: 'SONIC_VERSION_CONTROL_COMPONENTS='
-    - template: azure-pipelines-repd-build-variables.yml
+    - template: .azure-pipelines/azure-pipelines-repd-build-variables.yml@buildimage
   jobs:
   - template: azure-pipelines-build.yml
     parameters:
       jobFilters: ${{ parameters.jobFilters }}
       buildOptions: '${{ variables.VERSION_CONTROL_OPTIONS }} DEFAULT_CONTAINER_REGISTRY=${{ variables.DEFAULT_CONTAINER_REGISTRY }} SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y'
       preSteps:
-      - template: template-clean-sonic-slave.yml
+      - template: .azure-pipelines/template-clean-sonic-slave.yml@buildimage
 - stage: UpgradeVersions
   jobs:
   - job: UpgradeVersions
diff --git a/.azure-pipelines/template-clean-sonic-slave.yml b/.azure-pipelines/template-clean-sonic-slave.yml
index cc995e9c2621..bae4bf54a0b7 100644
--- a/.azure-pipelines/template-clean-sonic-slave.yml
+++ b/.azure-pipelines/template-clean-sonic-slave.yml
@@ -1,5 +1,6 @@
 steps:
 - script: |
+    set -x
     containers=$(docker container ls -a | grep "sonic-slave" | awk '{ print $1 }')
     [ -n "$containers" ] && docker container rm -f containers
     docker images | grep "^<none>" | awk '{print$3}' | xargs -i docker rmi {}