VPP: install dpdk and contrib for now

Installing both dep packages for now

Change-Id: Ib41dc85cc0e08992928f813a45cf04a00ee4fe79
Signed-off-by: Ed Kern <ejk@cisco.com>

diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
index a4543d6..f5a5858 100644 (file)
--- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh
+++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
@@ -16,8 +16,8 @@ function setup {
                 rm /etc/apt/sources.list.d/99fd.io.list
             fi
             curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh | sudo bash
-            #sudo apt-get -y --force-yes install vpp-dpdk-dev || true
-            #sudo apt-get -y --force-yes install vpp-dpdk-dkms || true
+            sudo apt-get -y --force-yes install vpp-dpdk-dev || true
+            sudo apt-get -y --force-yes install vpp-dpdk-dkms || true
             sudo apt-get -y --force-yes install vpp-dev-contrib || true
         elif [ "$OS_ID" == "centos" ]; then
             if [ -f /etc/yum.repos.d/fdio-master.repo ]; then
@@ -25,7 +25,7 @@ function setup {
                 rm /etc/yum.repos.d/fdio-master.repo
             fi
             curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh | sudo bash
-            #sudo yum -y install vpp-dpdk-devel || true
+            sudo yum -y install vpp-dpdk-devel || true
             sudo yum -y install vpp-dev-contrib || true
         elif [ "$OS_ID" == "opensuse" ]; then
             REPO_URL="${NEXUSPROXY}/content/repositories/fd.io.${REPO_NAME}"
@@ -38,7 +38,7 @@ enabled=1
 gpgcheck=0
 EOF
             sudo mv fdio-master.repo /etc/yum/repos.d/fdio-master.repo
-            #sudo yum -y install vpp-dpdk-devel || true
+            sudo yum -y install vpp-dpdk-devel || true
             sudo yum -y install vpp-dev-contrib || true
         fi
     fi