summaryrefslogtreecommitdiffstats
path: root/jjb/vpp
diff options
context:
space:
mode:
authorMaciek Konstantynowicz <mkonstan@cisco.com>2017-07-06 17:12:27 +0100
committerMaciek Konstantynowicz <mkonstan@cisco.com>2017-07-06 17:20:42 +0100
commit2ec74e172bb8aa133d525312484d5193ccf4ee86 (patch)
tree0a3b74d6571cfa72e03b95854a22eb92d6062438 /jjb/vpp
parent3065a538c6c80e80a00683f0a6f8f1aca52a4e7a (diff)
Fix backward compatibility issue with vagrant directory move
build-root/vagrant -> ../extras/vagrant. Change-Id: Ic6a46345d2cb82d4d9c9eba78eb66d21559a1d24 Signed-off-by: Maciek Konstantynowicz <mkonstan@cisco.com>
Diffstat (limited to 'jjb/vpp')
-rw-r--r--jjb/vpp/include-raw-vpp-build.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh
index 5e603d216..582971c86 100644
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -32,16 +32,16 @@ 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 extras/vagrant/build.sh
+# else use the old build-root/vagrant/build.sh
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 extras/vagrant/build.sh\""
+ echo "Building using \"make build-root/vagrant/build.sh\""
[ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes dpdk-install-dev
- [ "x${DRYRUN}" == "xTrue" ] || extras/vagrant/build.sh
+ [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh
fi
if [ "x${VPP_REPO}" == "x1" ]; then