diff options
| author |   Juraj Linkeš <juraj.linkes@pantheon.tech> | 2020-05-29 15:16:10 +0200 |
|---|---|---|
| committer | Juraj Linkeš <juraj.linkes@pantheon.tech> | 2020-06-01 08:18:28 +0200 |
| commit | 9f2d4cec9b9db1ebbcf1c5bbbf7fa54170006208 (patch) | |
| tree | fdaee0174d62da029875b1aefe10bb18ce320bce /jjb/scripts/vpp | |
| parent | 0e4d21ba4f01911130e2ed54bd1faff8baf8b5b0 (diff) | |
Add MAKE_PARALLEL_JOBS parameter
VPP uses the MAKE_PARALLEL_JOBS variable to limit the number of cpus
used for build. Make that varialbe configurable as job paramter instead
of setting it in script for easier job management.
Change-Id: Iaaafdb216c3af9244827b270c540a70b5844021f
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
Diffstat (limited to 'jjb/scripts/vpp')
| -rw-r--r-- | jjb/scripts/vpp/arm-build.sh | 8 | ||||
| -rw-r--r-- | jjb/scripts/vpp/build.sh | 5 | ||||
| -rw-r--r-- | jjb/scripts/vpp/parallel-vars.sh | 11 |
3 files changed, 12 insertions, 12 deletions
diff --git a/jjb/scripts/vpp/arm-build.sh b/jjb/scripts/vpp/arm-build.sh index 2abe6105d..798e90e96 100644 --- a/jjb/scripts/vpp/arm-build.sh +++ b/jjb/scripts/vpp/arm-build.sh @@ -46,11 +46,17 @@ echo "IS_CSIT_VPP_JOB=${IS_CSIT_VPP_JOB}" # If and only if we are doing verify *after* make verify was made to work # and we are not a CSIT job just building packages, then use make verify, # else use the old build-root/vagrant/build.sh +if [ "x${MAKE_PARALLEL_JOBS}" != "x" ] +then + echo "Building with MAKE_PARALLEL_JOBS=${MAKE_PARALLEL_JOBS}" + TEST_JOBS="TEST_JOBS=${MAKE_PARALLEL_JOBS}" +fi + if (git log --oneline | grep 37682e1 > /dev/null 2>&1) && \ [ "x${IS_CSIT_VPP_JOB}" != "xTrue" ] then echo "Building using \"make verify\"" - [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify SKIP_AARCH64=yes + [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes SKIP_AARCH64=yes ${TEST_JOBS} verify else echo "Building using \"make build-root/vagrant/build.sh\"" [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes install-dep diff --git a/jjb/scripts/vpp/build.sh b/jjb/scripts/vpp/build.sh index 6fdaec133..9fd989fd1 100644 --- a/jjb/scripts/vpp/build.sh +++ b/jjb/scripts/vpp/build.sh @@ -40,6 +40,11 @@ echo "IS_CSIT_VPP_JOB=${IS_CSIT_VPP_JOB}" # If and only if we are doing verify *after* make verify was made to work # and we are not a CSIT job just building packages, then use make verify, # else use make pkg-verify. +if [ "x${MAKE_PARALLEL_JOBS}" != "x" ] +then + echo "Building with MAKE_PARALLEL_JOBS=${MAKE_PARALLEL_JOBS}" +fi + if (git log --oneline | grep 37682e1 > /dev/null 2>&1) && \ [ "x${IS_CSIT_VPP_JOB}" != "xTrue" ] then diff --git a/jjb/scripts/vpp/parallel-vars.sh b/jjb/scripts/vpp/parallel-vars.sh deleted file mode 100644 index 1a5de149f..000000000 --- a/jjb/scripts/vpp/parallel-vars.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -CORES=4 -if [[ $(uname -m) == 'aarch64' ]] -then - CORES=16 -fi - -echo "Using MAKE_PARALLEL_FLAGS='-j $CORES' TEST_JOBS=$CORES for parallel build/test" - -export MAKE_PARALLEL_FLAGS="-j $CORES" -export TEST_JOBS=$CORES |