Skip to content

Commit

Permalink
[jenkins] Marvell ARMv7 armhf build improvements (sonic-net#201)
Browse files Browse the repository at this point in the history
This commit provides the following improvements to the Marvell armhf builds
performed by Jenkins.

1. Improve build performance by attempting a build using SONIC_BUILD_JOBS=4. If
   that fails then try SONIC_BUILD_JOBS=2. If that fails then try
   SONIC_BUILD_JOBS=1. If that fails we are done.

2. Disable concurrent builds from the same branch. This strives to avoid a
   current armhf build limitation where multiple builds executed on the same
   build machine interfere with each other.
  • Loading branch information
dflynn-Nokia committed Dec 30, 2020
1 parent 7f37a26 commit 2464d2b
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions jenkins/marvell-armhf/buildimage-mrvl-armhf-all/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ pipeline {

options {
buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '30'))
disableConcurrentBuilds()
}

environment {
Expand Down Expand Up @@ -38,9 +39,9 @@ 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=marvell-armhf PLATFORM_ARCH=armhf
make SONIC_CONFIG_BUILD_JOBS=1 INSTALL_DEBUG_TOOLS=y target/sonic-marvell-armhf.bin
make SONIC_CONFIG_BUILD_JOBS=4 INSTALL_DEBUG_TOOLS=y target/sonic-marvell-armhf.bin || make SONIC_CONFIG_BUILD_JOBS=2 INSTALL_DEBUG_TOOLS=y target/sonic-marvell-armhf.bin || make SONIC_CONFIG_BUILD_JOBS=1 INSTALL_DEBUG_TOOLS=y target/sonic-marvell-armhf.bin
mv target/sonic-marvell-armhf.bin target/sonic-marvell-armhf-dbg.bin
make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-marvell-armhf.bin
make SONIC_CONFIG_BUILD_JOBS=4 target/sonic-marvell-armhf.bin || make SONIC_CONFIG_BUILD_JOBS=2 target/sonic-marvell-armhf.bin || make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-marvell-armhf.bin
sudo docker -H unix:///var/run/march/docker.sock system prune -f
'''
}
Expand Down

0 comments on commit 2464d2b

Please sign in to comment.