Skip to content

Commit 23c90da

Browse files
authored
[jenkins] Marvell ARMv7 armhf build fix (sonic-net#202)
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.
1 parent 2464d2b commit 23c90da

File tree

1 file changed

+2
-2
lines changed
  • jenkins/marvell-armhf/buildimage-mrvl-armhf-all

1 file changed

+2
-2
lines changed

jenkins/marvell-armhf/buildimage-mrvl-armhf-all/Jenkinsfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ pipeline {
3939
git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $(realpath --relative-to=. $(cut -d" " -f2 .git))" > .git'
4040
export DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker
4141
make configure PLATFORM=marvell-armhf PLATFORM_ARCH=armhf
42-
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
42+
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
4343
mv target/sonic-marvell-armhf.bin target/sonic-marvell-armhf-dbg.bin
44-
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
44+
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
4545
sudo docker -H unix:///var/run/march/docker.sock system prune -f
4646
'''
4747
}

0 commit comments

Comments
 (0)