X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fscripts%2Fsetup_vpp_ubuntu_docker_test.sh;h=1fca7821559a0b536f924d2576537dff7979939c;hb=de41dd26f5c342c486c23d8e21bab32e58d50f0c;hp=aeae56f7b64c1c9bf8f01a43d013874783e28945;hpb=50f36eef6881af773393fe28039cc936903c1b19;p=ci-management.git

diff --git a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
index aeae56f7b..1fca78215 100644
--- 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