diff options
| author |   Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2017-07-07 18:57:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2017-07-07 18:57:20 +0000 |
| commit | 29fe9944656cbf6a48a531fb0575d785320cb6a4 (patch) | |
| tree | fe876ba7892fab042b9a4fdc3ab939ff6fdd5086 /jjb/vpp | |
| parent | f0f6dbfa80c0a6068ecf5c8021bb7295af562e91 (diff) | |
| parent | 2ec74e172bb8aa133d525312484d5193ccf4ee86 (diff) | |
Merge "Fix backward compatibility issue with vagrant directory move build-root/vagrant -> ../extras/vagrant."
Diffstat (limited to 'jjb/vpp')
| -rw-r--r-- | jjb/vpp/include-raw-vpp-build.sh | 6 |
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 |