Skip to content

Commit

Permalink
[jenkins] Marvell ARMv7 armhf build fix (sonic-net#202)
Browse files Browse the repository at this point in the history
This commit fixes a bug in the changes provided in PR# 201.
In particular the number of concurrent build jobs (SONIC_BUILD_JOBS) is
correctly specified.
  • Loading branch information
dflynn-Nokia authored Dec 31, 2020
1 parent 2464d2b commit 23c90da
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions jenkins/marvell-armhf/buildimage-mrvl-armhf-all/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,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=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
make SONIC_BUILD_JOBS=4 INSTALL_DEBUG_TOOLS=y target/sonic-marvell-armhf.bin || make SONIC_BUILD_JOBS=2 INSTALL_DEBUG_TOOLS=y target/sonic-marvell-armhf.bin || make SONIC_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=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
make SONIC_BUILD_JOBS=4 target/sonic-marvell-armhf.bin || make SONIC_BUILD_JOBS=2 target/sonic-marvell-armhf.bin || make SONIC_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 23c90da

Please sign in to comment.