diff options
| author |   Juraj Linkeš <juraj.linkes@pantheon.tech> | 2020-07-06 15:59:14 +0200 |
|---|---|---|
| committer | Juraj Linkeš <juraj.linkes@pantheon.tech> | 2020-07-08 08:09:25 +0000 |
| commit | 34b30a1717e1e5c65524ce2db234dc1370344c4e (patch) | |
| tree | d92cd9121b6a2c4dfa09e549dfc7768f542f38e9 /jjb/scripts/vpp/build.sh | |
| parent | cea930f9bb0d339019cb84101ee451d63c3c0368 (diff) | |
Unify arm and x86 vpp jobs
There are two sets of scripts doing basically the same thing,
one set for arm and one for x86. Use the same scripts for both
x86 and arm jobs, remove the unnecessary ones and update the scripts
so that they work on both architectures.
Change-Id: Ie9c29578d0f6af41e65c0f4723bc248e664cb8dd
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
Diffstat (limited to 'jjb/scripts/vpp/build.sh')
| -rw-r--r-- | jjb/scripts/vpp/build.sh | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/jjb/scripts/vpp/build.sh b/jjb/scripts/vpp/build.sh index 9fd989fd..c6ab0d65 100644 --- a/jjb/scripts/vpp/build.sh +++ b/jjb/scripts/vpp/build.sh @@ -43,13 +43,23 @@ echo "IS_CSIT_VPP_JOB=${IS_CSIT_VPP_JOB}" if [ "x${MAKE_PARALLEL_JOBS}" != "x" ] then echo "Building with MAKE_PARALLEL_JOBS=${MAKE_PARALLEL_JOBS}" + export TEST_JOBS="${MAKE_PARALLEL_JOBS}" +else + export TEST_JOBS="auto" +fi + +if [ "x${MAKE_PARALLEL_FLAGS}" != "x" ] +then + echo "Building with MAKE_PARALLEL_FLAGS=${MAKE_PARALLEL_FLAGS}" 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 echo "Building using \"make verify\"" - [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes TEST_JOBS=auto verify + [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify else echo "Building using \"make pkg-verify\"" [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes pkg-verify @@ -64,6 +74,8 @@ if [ "x${VPP_REPO}" == "x1" ]; then fi fi +local_arch=$(uname -m) + echo "*******************************************************************" -echo "* VPP BUILD SUCCESSFULLY COMPLETED" +echo "* VPP ${local_arch^^} BUILD SUCCESSFULLY COMPLETED" echo "*******************************************************************" |