Skip to content

Commit bf429d6

Browse files
Fix sonic-mgmt
1 parent 1c05f66 commit bf429d6

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.azure-pipelines/docker-sonic-mgmt.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,18 @@ stages:
3232
- stage: Build
3333
jobs:
3434
- job: Build
35-
pool: sonictest
35+
pool: sonicbld
3636
timeoutInMinutes: 360
3737
steps:
3838
- template: cleanup.yml
3939
- checkout: self
4040
clean: true
41-
submodules: recursive
4241
- bash: |
4342
set -xe
44-
make configure PLATFORM=generic
45-
make target/docker-sonic-mgmt.gz
43+
git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data
44+
45+
make NOBUSTER=1 DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic
46+
make NOBUSTER=1 DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y target/docker-sonic-mgmt.gz
4647
cp target -r $(Build.ArtifactStagingDirectory)/target
4748
docker load -i target/docker-sonic-mgmt.gz
4849
docker tag docker-sonic-mgmt $REGISTRY_SERVER/docker-sonic-mgmt:latest

rules/docker-sonic-mgmt.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ DOCKER_SONIC_MGMT = docker-sonic-mgmt.gz
33
$(DOCKER_SONIC_MGMT)_PATH = $(DOCKERS_PATH)/docker-sonic-mgmt
44
$(DOCKER_SONIC_MGMT)_DEPENDS += $(SONIC_DEVICE_DATA) $(PTF)
55
SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_MGMT)
6-
SONIC_STRETCH_DOCKERS += $(DOCKER_SONIC_MGMT)
6+
SONIC_BUSTER_DOCKERS += $(DOCKER_SONIC_MGMT)

src/sonic-build-hooks/scripts/buildinfo_base.sh

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ else
2121
PKG_CACHE_PATH=/sonic/target/vcache/${IMAGENAME}
2222
fi
2323
PKG_CACHE_FILE_NAME=${PKG_CACHE_PATH}/cache.tgz
24+
sudo chown $USER $(dirname $PKG_CACHE_PATH)
2425
mkdir -p ${PKG_CACHE_PATH}
2526

2627
. ${BUILDINFO_PATH}/scripts/utils.sh

0 commit comments

Comments
 (0)