Merge "Fix HC2VPP linting"

[ci-management.git] / jjb / scripts / setup_vpp_ubuntu_docker_test.sh

diff --git a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
index d7a2ee1..c9000df 100644 (file)
--- a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
+++ b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
@@ -21,7 +21,19 @@ grep search /etc/resolv.conf  || true
 
 if [ "${OS_ID}" == "ubuntu" ]; then
     dpkg-query -W -f='${binary:Package}\t${Version}\n' || true
+    echo "************************************************************************"
+    echo "pip list:"
     pip list || true
+    echo "************************************************************************"
+    echo "Contents of /var/cache/vpp/python/virtualenv/lib/python2.7/site-packages:"
+    ls -lth /var/cache/vpp/python/virtualenv/lib/python2.7/site-packages || true
+    echo "************************************************************************"
+    echo "Contents of br Downloads:"
+    ls -lth /w/Downloads || true
+    echo "************************************************************************"
+    echo "Contents of /w/dpdk for test folks:"
+    echo "************************************************************************"
+    ls -lth /w/dpdk || true
 elif [ "${OS_ID}" == "centos" ]; then
     yum list installed || true
     pip list || true
@@ -30,8 +42,19 @@ elif [ "${OS_ID}" == "opensuse" ]; then
     pip list || true
 fi
 
-if [ "x${IS_CSIT_VPP_JOB}" == "xTrue" ]; then
-       (cd dpdk ; apt-get download vpp-dpdk-dkms > /dev/null 2>&1) || true
-    ls -l dpdk/*.deb || true
-    echo "csit vpp-dpdk-dkms package download"
-fi
\ No newline at end of file
+##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
+        apt-get -y remove vpp-ext-deps || true
+    elif [ "${OS_ID}" == "centos" ]; then
+        yum -y erase vpp-dpdk-devel || true
+        yum -y erase vpp-ext-deps || true
+        yum clean all || true
+    elif [ "${OS_ID}" == "opensuse" ]; then
+        yum -y erase vpp-dpdk-devel || true
+        yum -y erase vpp-ext-deps || true
+    fi
+fi