From 9f2d4cec9b9db1ebbcf1c5bbbf7fa54170006208 Mon Sep 17 00:00:00 2001
From: Juraj Linkeš <juraj.linkes@pantheon.tech>
Date: Fri, 29 May 2020 15:16:10 +0200
Subject: Add MAKE_PARALLEL_JOBS parameter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 jjb/scripts/vpp/arm-build.sh     |  8 +++++++-
 jjb/scripts/vpp/build.sh         |  5 +++++
 jjb/scripts/vpp/parallel-vars.sh | 11 -----------
 3 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 jjb/scripts/vpp/parallel-vars.sh

(limited to 'jjb/scripts/vpp')

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
-- 
cgit 1.2.3-korg