summaryrefslogtreecommitdiffstats
path: root/jjb/vpp/include-raw-vpp-build.sh
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-07-22 11:24:16 +0000
committerPeter Mikus <pmikus@cisco.com>2019-07-22 11:32:11 +0000
commit711c8c7b23aabc6484418e80272b7eca6c30e27c (patch)
tree09850dc865ab81cfe59be80b4865dc74b05f0346 /jjb/vpp/include-raw-vpp-build.sh
parent5a7fdee2486c23fe5e4ede8ea5967250ebf39395 (diff)
Align CSIT jobs VPP compilation with VPP jobs compilation
Change-Id: I5143fab3b20beee3741bccc5c18032b4fdbc30ef Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'jjb/vpp/include-raw-vpp-build.sh')
-rw-r--r--jjb/vpp/include-raw-vpp-build.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh
index 6a13995e5..1fe995fc2 100644
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -39,17 +39,15 @@ echo "CC=${CC}"
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
+# else use make pkg-verify.
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
else
- echo "Building using \"make build-root/vagrant/build.sh\""
- [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes install-dep
- [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes dpdk-install-dev
- [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh
+ echo "Building using \"make pkg-verify\""
+ [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes pkg-verify
fi
if [ "x${VPP_REPO}" == "x1" ]; then