Skip to content

Commit

Permalink
Fix sonic-slave docker image environment issue. (sonic-net#727)
Browse files Browse the repository at this point in the history
* Use correct sonic-slave image.
liushilongbuaa committed Mar 9, 2023
1 parent 3e34309 commit ec49e4b
Showing 4 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/build-sairedis-template.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .azure-pipelines/build-swss-template.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .azure-pipelines/build-template.yml
Original file line number Diff line number Diff line change
@@ -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
15 changes: 7 additions & 8 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit ec49e4b

Please sign in to comment.