3 files changed, 10 insertions, 11 deletions
diff --git a/vpp-bootstrap/containers/cone.cntr b/vpp-bootstrap/containers/cone.cntr
index 237496c..9c00ec0 100644
--- a/vpp-bootstrap/containers/cone.cntr
+++ b/vpp-bootstrap/containers/cone.cntr
@@ -1,4 +1,5 @@
 DESC: This container is used for vpp testing with scapy.
 DIST: ubuntu
 VER: trusty
-PACKAGES: python-scapy
+PACKAGES: python-pip
+PIP: scapy
diff --git a/vpp-bootstrap/containers/ctwo.cntr b/vpp-bootstrap/containers/ctwo.cntr
index 56a83c8..2a764e2 100644
--- a/vpp-bootstrap/containers/ctwo.cntr
+++ b/vpp-bootstrap/containers/ctwo.cntr
@@ -1,4 +1,4 @@
 DESC: This is the vpp build/test container. 
 DIST: ubuntu
 VER: trusty
-PACKAGES: make gcc autotools-dev autoconf linux-headers-kernver
+PACKAGES: make gcc autotools-dev autoconf linux-headers-kernver gdb
diff --git a/vpp-bootstrap/containers/ctwo.provision.sh b/vpp-bootstrap/containers/ctwo.provision.sh
index 2ba66c6..d8e5796 100755
--- a/vpp-bootstrap/containers/ctwo.provision.sh
+++ b/vpp-bootstrap/containers/ctwo.provision.sh
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+VPP_VERSION=v17.01
 VPP_DIR=~/vpp
 VPP_GIT="https://git.fd.io/vpp"
-#PLATFORM=vpp_lite
-PLATFORM=vpp
+PLATFORM=vpp_lite
 
 echo Cloning $VPP_GIT
 git clone $VPP_GIT $VPP_DIR
@@ -23,6 +23,7 @@ git clone $VPP_GIT $VPP_DIR
 # Install dependencies
 echo Building $VPP_DIR
 cd $VPP_DIR
+git checkout -b $VPP_VERSION $VPP_VERSION
 make UNATTENDED=yes install-dep
 
 make wipe
@@ -31,10 +32,7 @@ rm -f build-root/.bootstrap.ok
 
 # Build and install packaging
 make PLATFORM=$PLATFORM bootstrap
-make PLATFORM=$PLATFORM pkg-deb
-
-# Install VPPP
-(cd ${VPP_DIR}/build-root/;sudo dpkg -i *.deb)
-
-sudo sed -i 's/dpdk {/dpdk {\n\tno-pci\n/' /etc/vpp/startup.conf
-sudo service vpp start
+make PLATFORM=$PLATFORM build
+#not sure why this is needed to called explicitly
+make PLATFORM=$PLATFORM build-vpp-api
+make PLATFORM=$PLATFORM plugins