VPP: forcing removal of old dpdk packages

this is for building older vpp branches with older dpdk releases
Removes older dpdk before older version attempts to install.
Using remove and install approach over downgrade for more
consistent results

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

diff --git a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
index aeae56f..1fca782 100644 (file)
--- a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
+++ b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
@@ -29,3 +29,15 @@ elif [ "${OS_ID}" == "opensuse" ]; then
     yum list installed || true
     pip list || true
 fi
+
+##This will remove any previously installed dpdk for old branch builds
+
+if [ "${GERRIT_BRANCH}" != "master" ]; then
+    if [ "${OS_ID}" == "ubuntu" ]; then
+        apt-get -y remove vpp-dpdk-dev || true
+        apt-get -y remove vpp-dpdk-dkms || true
+    elif [ "${OS_ID}" == "centos" ]; then
+        yum -y erase vpp-dpdk-devel || true
+        yum clean all || true
+    fi
+fi