Merge "Unify echo MAKE_PARALLEL vars with CSIT"

1 files changed, 17 insertions, 8 deletions

diff --git a/jjb/scripts/vpp/build.sh b/jjb/scripts/vpp/build.sh
index c6ab0d65..68fa30d1 100644
--- a/jjb/scripts/vpp/build.sh
+++ b/jjb/scripts/vpp/build.sh
@@ -40,21 +40,30 @@ 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" ]
+
+if [ "x${MAKE_PARALLEL_FLAGS}" != "x" ]
 then
-  echo "Building with MAKE_PARALLEL_JOBS=${MAKE_PARALLEL_JOBS}"
-  export TEST_JOBS="${MAKE_PARALLEL_JOBS}"
+  echo "Building VPP. Number of cores for build set with" \
+       "MAKE_PARALLEL_FLAGS='${MAKE_PARALLEL_FLAGS}'."
+elif [ "x${MAKE_PARALLEL_JOBS}" != "x" ]
+then
+  echo "Building VPP. Number of cores for build set with" \
+       "MAKE_PARALLEL_JOBS='${MAKE_PARALLEL_JOBS}'."
 else
-  export TEST_JOBS="auto"
+  echo "Building VPP. Number of cores not set, " \
+       "using build default ($(grep -c ^processor /proc/cpuinfo))."
 fi
 
-if [ "x${MAKE_PARALLEL_FLAGS}" != "x" ]
+if [ "x${MAKE_PARALLEL_JOBS}" != "x" ]
 then
-  echo "Building with MAKE_PARALLEL_FLAGS=${MAKE_PARALLEL_FLAGS}"
+  export TEST_JOBS="${MAKE_PARALLEL_JOBS}"
+  echo "Testing VPP with ${TEST_JOBS} cores."
+else
+  export TEST_JOBS="auto"
+  echo "Testing VPP with automatically calculated number of cores. " \
+       "See test logs for the exact number."
 fi
 
-echo "Building with TEST_JOBS=${TEST_JOBS}"
-
 if (git log --oneline | grep 37682e1 > /dev/null 2>&1) && \
         [ "x${IS_CSIT_VPP_JOB}" != "xTrue" ]
 then