Merge "VPP: disable 1device perpatch"

diff --git a/jjb/vpp/include-raw-vpp-arm-build-no-test.sh b/jjb/vpp/include-raw-vpp-arm-build-no-test.sh
index 94cc824..8557dc1 100644 (file)
--- a/jjb/vpp/include-raw-vpp-arm-build-no-test.sh
+++ b/jjb/vpp/include-raw-vpp-arm-build-no-test.sh
@@ -39,9 +39,9 @@ echo "CC=${CC}"
 
 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 -C build-root TAG=vpp wipe-all install-packages
+make UNATTENDED=yes -C build-root TAG=vpp sample-plugin-install
+make UNATTENDED=yes -C build-root TAG=vpp libmemif-install
 make UNATTENDED=yes pkg-deb
 
 if [ "x${VPP_REPO}" == "x1" ]; then

diff --git a/jjb/vpp/include-raw-vpp-clang-build.sh b/jjb/vpp/include-raw-vpp-clang-build.sh
index 5039d5c..f1c1422 100644 (file)
--- a/jjb/vpp/include-raw-vpp-clang-build.sh
+++ b/jjb/vpp/include-raw-vpp-clang-build.sh
@@ -29,10 +29,10 @@ echo "sha1sum of this script: ${0}"
 sha1sum $0
 
 make UNATTENDED=yes install-dep
-make UNATTENDED=yes dpdk-install-dev
-make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp_clang CC=clang CXX=clang install-packages
-make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp_clang CC=clang CXX=clang sample-plugin-install
-make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp_clang CC=clang CXX=clang libmemif-install
+make UNATTENDED=yes install-ext-deps
+make UNATTENDED=yes -C build-root TAG=vpp_clang CC=clang CXX=clang install-packages
+make UNATTENDED=yes -C build-root TAG=vpp_clang CC=clang CXX=clang sample-plugin-install
+make UNATTENDED=yes -C build-root TAG=vpp_clang CC=clang CXX=clang libmemif-install
 
 
 echo "*******************************************************************"