Fix sonic-slave docker image environment issue. (sonic-net#727)

* Use correct sonic-slave image.
liushilongbuaa · Mar 9, 2023 · ec49e4b · ec49e4b
1 parent 3e34309
commit ec49e4b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/.azure-pipelines/build-sairedis-template.yml b/.azure-pipelines/build-sairedis-template.yml
@@ -45,7 +45,7 @@ jobs:
       vmImage: 'ubuntu-20.04'
 
   container:
-    image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:latest
+    image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}
 
   steps:
   - checkout: sonic-sairedis

diff --git a/.azure-pipelines/build-swss-template.yml b/.azure-pipelines/build-swss-template.yml
@@ -45,7 +45,7 @@ jobs:
       vmImage: 'ubuntu-20.04'
 
   container:
-    image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:latest
+    image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}
 
   steps:
   - checkout: sonic-swss

diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
@@ -40,7 +40,7 @@ jobs:
       vmImage: 'ubuntu-20.04'
 
   container:
-    image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:latest
+    image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}
 
   steps:
   - checkout: self

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -81,8 +81,7 @@ stages:
   - template: .azure-pipelines/build-template.yml
     parameters:
       arch: amd64
-      pool: sonic-common
-      sonic_slave: sonic-slave-${{ parameters.debian_version }}
+      sonic_slave: sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH)
       artifact_name: sonic-swss-common
       run_unit_test: true
 
@@ -94,16 +93,16 @@ stages:
     parameters:
       arch: armhf
       timeout: 180
-      pool: sonicbld
-      sonic_slave: sonic-slave-${{ parameters.debian_version }}-armhf
+      pool: sonicbld-armhf
+      sonic_slave: sonic-slave-${{ parameters.debian_version }}-armhf:$(BUILD_BRANCH)
       artifact_name: sonic-swss-common.armhf
 
   - template: .azure-pipelines/build-template.yml
     parameters:
       arch: arm64
       timeout: 180
-      pool: sonicbld
-      sonic_slave: sonic-slave-${{ parameters.debian_version }}-arm64
+      pool: sonicbld-arm64
+      sonic_slave: sonic-slave-${{ parameters.debian_version }}-arm64:$(BUILD_BRANCH)
       artifact_name: sonic-swss-common.arm64
 
 - stage: BuildSairedis
@@ -113,7 +112,7 @@ stages:
   - template: .azure-pipelines/build-sairedis-template.yml
     parameters:
       arch: amd64
-      sonic_slave: sonic-slave-${{ parameters.debian_version }}
+      sonic_slave: sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH)
       swss_common_artifact_name: sonic-swss-common
       artifact_name: sonic-sairedis
       syslog_artifact_name: sonic-sairedis.syslog
@@ -125,7 +124,7 @@ stages:
   - template: .azure-pipelines/build-swss-template.yml
     parameters:
       arch: amd64
-      sonic_slave: sonic-slave-${{ parameters.debian_version }}
+      sonic_slave: sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH)
       swss_common_artifact_name: sonic-swss-common
       sairedis_artifact_name: sonic-sairedis
       artifact_name: sonic-swss