From de41dd26f5c342c486c23d8e21bab32e58d50f0c Mon Sep 17 00:00:00 2001 From: Ed Kern Date: Tue, 13 Mar 2018 11:49:05 -0600 Subject: [PATCH] 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 --- jjb/scripts/setup_vpp_ubuntu_docker_test.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 -- 2.16.6