diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2017-06-16 10:04:12 +0200 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2017-06-28 16:25:49 -0400 |
| commit | f70b56deb3b825cdf69ab1d506fe37aa037fe9cf (patch) | |
| tree | e4efff9aaf8124ae246ca68ecc9c68dedc5df456 /jjb/vpp/include-raw-vpp-build.sh | |
| parent | dc41ccdc01cfc89f0e08151bcc489fbf53ce175e (diff) | |
CSIT-682 Usage of make-verify for vpp-csit-verify jobs
Solve DPDK dependency in vpp-csit-verify* jobs, so that every time
vpp-csit-verify* is triggered the latest DPDK is build and used. This
patch will allows us to verify latest DPDK changes and be able to link
dpdk-plugin dependencies. It suppose the remove the dependency of
upgrading DPDK_DEV manually in CSIT branch.
Change-Id: Id560e4798ae9261bc98497a1ffb211b39131d0e3
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'jjb/vpp/include-raw-vpp-build.sh')
| -rw-r--r-- | jjb/vpp/include-raw-vpp-build.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh index b51b41a32..5e603d216 100644 --- a/jjb/vpp/include-raw-vpp-build.sh +++ b/jjb/vpp/include-raw-vpp-build.sh @@ -32,15 +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 build-root/vagrant/build.sh +# else use the old extras/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 \"build-root/vagrant/build.sh\"" - [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh + echo "Building using \"make extras/vagrant/build.sh\"" + [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes dpdk-install-dev + [ "x${DRYRUN}" == "xTrue" ] || extras/vagrant/build.sh fi if [ "x${VPP_REPO}" == "x1" ]; then |