diff options
| author |   Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2018-09-19 17:57:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2018-09-19 17:57:12 +0000 |
| commit | e673200d2ea414549e6ee88c880c8ade2c1eabf4 (patch) | |
| tree | 1aa5f6759d932ecd44de1e89857b58a3f2aa44b9 /jjb/scripts/setup_vpp_ubuntu_docker_test.sh | |
| parent | 453587e7e041cc73860fbd3bbe8650a802fa9827 (diff) | |
| parent | 0166b59678703235f55620442f4d076f1d58085f (diff) | |
Merge "VPP: replace dpdk-dev with dev-contrib"
Diffstat (limited to 'jjb/scripts/setup_vpp_ubuntu_docker_test.sh')
| -rw-r--r-- | jjb/scripts/setup_vpp_ubuntu_docker_test.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh index 2e1b1340d..f0a87ff32 100644 --- a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh +++ b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh @@ -48,10 +48,13 @@ 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 + apt-get -y remove vpp-dev-contrib || true elif [ "${OS_ID}" == "centos" ]; then yum -y erase vpp-dpdk-devel || true + yum -y erase vpp-dev-contrib || true yum clean all || true elif [ "${OS_ID}" == "opensuse" ]; then yum -y erase vpp-dpdk-devel || true + yum -y erase vpp-dev-contrib || true fi fi |