diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/vpp/include-raw-vpp-arm-build.sh | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/jjb/vpp/include-raw-vpp-arm-build.sh b/jjb/vpp/include-raw-vpp-arm-build.sh index 34c131344..94cc82449 100644 --- a/jjb/vpp/include-raw-vpp-arm-build.sh +++ b/jjb/vpp/include-raw-vpp-arm-build.sh @@ -36,21 +36,13 @@ echo "sha1sum of this script: ${0}" sha1sum $0 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 -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 TEST_JOBS=$TEST_JOBS 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 -fi + +make UNATTENDED=yes install-dep +make UNATTENDED=yes dpdk-install-dev +make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages +make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install +make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp libmemif-install +make UNATTENDED=yes pkg-deb if [ "x${VPP_REPO}" == "x1" ]; then if [ "x${REBASE_NEEDED}" == "x1" ]; then |