matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update docker-sonic-mgmt to buster (#13287)

Browse Source 
Why I did it
docker-sonic-mgmt build is failing.

How I did it
stretch docker is disabled recently. Update docker-sonic-mgmt to buster.
Migrate from sonictest to sonicbld. Because Azure requires migrate vm from uswest2 to uswest3.
Fix a build issue when build image.
How to verify it
This commit is contained in:
Liu Shilong 2023-01-11 16:00:47 +08:00 committed by GitHub
parent d7b2bdb996
commit 20f47bb5ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.azure-pipelines/docker-sonic-mgmt.yml
View File

@ -32,17 +32,18 @@ stages:
- stage: Build - stage: Build
jobs: jobs:
- job: Build - job: Build
pool: sonictest pool: sonicbld
timeoutInMinutes: 360 timeoutInMinutes: 360
steps: steps:
- template: cleanup.yml - template: cleanup.yml
- checkout: self - checkout: self
clean: true clean: true
submodules: recursive
- bash: | - bash: |
set -xe set -xe
make configure PLATFORM=generic git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data
make target/docker-sonic-mgmt.gz
make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic
make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y target/docker-sonic-mgmt.gz
cp target -r $(Build.ArtifactStagingDirectory)/target cp target -r $(Build.ArtifactStagingDirectory)/target
docker load -i target/docker-sonic-mgmt.gz docker load -i target/docker-sonic-mgmt.gz
docker tag docker-sonic-mgmt $REGISTRY_SERVER/docker-sonic-mgmt:latest docker tag docker-sonic-mgmt $REGISTRY_SERVER/docker-sonic-mgmt:latest

1
rules/docker-sonic-mgmt.mk
View File

@ -3,4 +3,3 @@ DOCKER_SONIC_MGMT = docker-sonic-mgmt.gz
$(DOCKER_SONIC_MGMT)_PATH = $(DOCKERS_PATH)/docker-sonic-mgmt $(DOCKER_SONIC_MGMT)_PATH = $(DOCKERS_PATH)/docker-sonic-mgmt
$(DOCKER_SONIC_MGMT)_DEPENDS += $(SONIC_DEVICE_DATA) $(PTF) $(DOCKER_SONIC_MGMT)_DEPENDS += $(SONIC_DEVICE_DATA) $(PTF)
SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_MGMT) SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_MGMT)
SONIC_STRETCH_DOCKERS += $(DOCKER_SONIC_MGMT)

1
src/sonic-build-hooks/scripts/buildinfo_base.sh
View File

@ -21,6 +21,7 @@ else
PKG_CACHE_PATH=/sonic/target/vcache/${IMAGENAME} PKG_CACHE_PATH=/sonic/target/vcache/${IMAGENAME}
fi fi
PKG_CACHE_FILE_NAME=${PKG_CACHE_PATH}/cache.tgz PKG_CACHE_FILE_NAME=${PKG_CACHE_PATH}/cache.tgz
sudo chown $USER $(dirname $PKG_CACHE_PATH)
mkdir -p ${PKG_CACHE_PATH} mkdir -p ${PKG_CACHE_PATH}
. ${BUILDINFO_PATH}/scripts/utils.sh . ${BUILDINFO_PATH}/scripts/utils.sh