From d31f3a595f131d38134e1957bd9caefca319fe61 Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Sat, 23 Apr 2016 22:21:57 -0500 Subject: [PATCH] Use build.sh for vpp build https://gerrit.fd.io/r/#/c/765/ is refactoring the vagrant to have a separate build.sh suitable for use outside of vagrant. It autodetects supported distros, installs dependencies, etc. This patch switches vpp jenkins jobs over to using build.sh. This should give us a unified path where: 1) CI Builds 2) Vagrant 3) Users starting out on their own Centos/Ubuntu boxes for the first time are all using the same build.sh. Change-Id: Iae7bca4e2a9e183e878d7638701e66735b388cbc Signed-off-by: Ed Warnicke --- jjb/vpp/include-raw-vpp-build.sh | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh index d4b6d748f..7ea6d6d59 100644 --- a/jjb/vpp/include-raw-vpp-build.sh +++ b/jjb/vpp/include-raw-vpp-build.sh @@ -11,18 +11,4 @@ else echo $CCACHE_DIR does not exist. This must be a new slave. fi -SUPPORTED="ubuntu1404 ubuntu1604 centos7" -declare -A DIST_TARGET -DIST_TARGET=( - [ubuntu1404]=install-deb - [ubuntu1604]=install-deb - [centos7]=install-rpm -) -if [[ ! ${SUPPORTED[*]} =~ ${OS} ]] -then - echo "Unrecognized OS: ${OS}. Please edit: https://gerrit.fd.io/r/gitweb?p=ci-management.git;a=blob;f=jjb/vpp/include-raw-vpp-build.sh;hb=HEAD" - exit 1 -fi -cd build-root/ -./bootstrap.sh -make PLATFORM=vpp V=0 TAG=vpp ${DIST_TARGET[${OS}]} \ No newline at end of file +build-root/vagrant/build.sh -- 2.16.6