Skip to content

Commit

Permalink
[Centec-ARM64]Reference to PR sonic-net#205, Optimize ARM64 build (so…
Browse files Browse the repository at this point in the history
…nic-net#210)

Reference to PR sonic-net#205, Optimize ARM64 build and make build more stable:
1. Skip building debug image
2. Add logic to cleanup the docker daemon
3. Remove all multi-arch build artifacts after building

Co-authored-by: Gu Xianghong <xgu@centecnetworks.com>
  • Loading branch information
guxianghong and Gu Xianghong committed Jan 7, 2021
1 parent ba5bb5d commit 22d50dd
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 8 deletions.
13 changes: 9 additions & 4 deletions jenkins/centec-arm64/buildimage-centec-arm64-202012/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,15 @@ pipeline {
git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $(realpath --relative-to=. $(cut -d" " -f2 .git))" > .git'
export DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker
make configure PLATFORM=centec-arm64 PLATFORM_ARCH=arm64
make SONIC_BUILD_JOBS=4 INSTALL_DEBUG_TOOLS=y target/sonic-centec-arm64.bin
mv target/sonic-centec-arm64.bin target/sonic-centec-dbg.bin
make SONIC_BUILD_JOBS=4 NOJESSIE=1 target/sonic-centec-arm64.bin
sudo docker -H unix:///var/run/march/docker.sock system prune -f
#Skip debug build until build time improvements can be made
#make SONIC_BUILD_JOBS=4 INSTALL_DEBUG_TOOLS=y target/sonic-centec-arm64.bin
#mv target/sonic-centec-arm64.bin target/sonic-centec-dbg.bin
make SONIC_BUILD_JOBS=4 target/sonic-centec-arm64.bin || make SONIC_BUILD_JOBS=2 target/sonic-centec-arm64.bin || make SONIC_BUILD_JOBS=1 target/sonic-centec-arm64.bin
# Cleanup for next build (dockerd and docker multi-arch artifacts)
if sudo [ -f dockerfs/var/run/docker.pid ] ; then
pid=`sudo cat dockerfs/var/run/docker.pid` ; sudo kill $pid
fi
sudo rm -rf ${DOCKER_DATA_ROOT_FOR_MULTIARCH}
'''
}
}
Expand Down
13 changes: 9 additions & 4 deletions jenkins/centec-arm64/buildimage-centec-arm64-all/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,15 @@ pipeline {
git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $(realpath --relative-to=. $(cut -d" " -f2 .git))" > .git'
export DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker
make configure PLATFORM=centec-arm64 PLATFORM_ARCH=arm64
make SONIC_BUILD_JOBS=4 INSTALL_DEBUG_TOOLS=y target/sonic-centec-arm64.bin
mv target/sonic-centec-arm64.bin target/sonic-centec-dbg.bin
make SONIC_BUILD_JOBS=4 NOJESSIE=1 target/sonic-centec-arm64.bin
sudo docker -H unix:///var/run/march/docker.sock system prune -f
#Skip debug build until build time improvements can be made
#make SONIC_BUILD_JOBS=4 INSTALL_DEBUG_TOOLS=y target/sonic-centec-arm64.bin
#mv target/sonic-centec-arm64.bin target/sonic-centec-dbg.bin
make SONIC_BUILD_JOBS=4 target/sonic-centec-arm64.bin || make SONIC_BUILD_JOBS=2 target/sonic-centec-arm64.bin || make SONIC_BUILD_JOBS=1 target/sonic-centec-arm64.bin
# Cleanup for next build (dockerd and docker multi-arch artifacts)
if sudo [ -f dockerfs/var/run/docker.pid ] ; then
pid=`sudo cat dockerfs/var/run/docker.pid` ; sudo kill $pid
fi
sudo rm -rf ${DOCKER_DATA_ROOT_FOR_MULTIARCH}
'''
}
}
Expand Down

0 comments on commit 22d50dd

Please sign in to comment.