X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fscripts%2Fsetup_vpp_ubuntu_docker_test.sh;h=90257f1c06715b410ad70fc0aa32dbb2a2ab3e30;hb=075ded3718f03d6ad3c3eb23685f06ed6cc8673b;hp=d0140c171bdfca6234fd112f178571ecfe082728;hpb=a47be3165aaadcd9b72b1d2bc2bd20128a5e944d;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 d0140c171..90257f1c0 100644
--- a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
+++ b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
@@ -12,21 +12,58 @@ set -e -o pipefail
 OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 
 if ! [ -z ${DOCKER_TEST} ] ; then
-		mount -o remount /dev/shm -o size=512M || true
+        # for 4 cores:
+        # framework.VppTestCase.MIN_REQ_SHM + (num_cores * framework.VppTestCase.SHM_PER_PROCESS)
+        # 1073741824 == 1024M (1073741824 >> 20)
+		sudo mount -o remount /dev/shm -o size=1024M || true
         echo "/dev/shm remounted"
 fi
 
+##container server node detection
+grep search /etc/resolv.conf  || true
+
 if [ "${OS_ID}" == "ubuntu" ]; then
-    dpkg-query -W -f='${binary:Package}\t${Version}\n'
-    pip list
+    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
-    pip list
+    yum list installed || true
+    pip list || true
 elif [ "${OS_ID}" == "opensuse" ]; then
-    pip list
+    yum list installed || true
+    pip list || true
+elif [ "${OS_ID}" == "opensuse-leap" ]; 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
+        sudo apt-get -y remove vpp-dpdk-dev || true
+        sudo apt-get -y remove vpp-dpdk-dkms || true
+        sudo apt-get -y remove vpp-ext-deps || true
+    elif [ "${OS_ID}" == "centos" ]; then
+        sudo yum -y erase vpp-dpdk-devel || true
+        sudo yum -y erase vpp-ext-deps || true
+        sudo yum clean all || true
+    elif [ "${OS_ID}" == "opensuse" ]; then
+        sudo yum -y erase vpp-dpdk-devel || true
+        sudo yum -y erase vpp-ext-deps || true
+    elif [ "${OS_ID}" == "opensuse-leap" ]; then
+        sudo yum -y erase vpp-dpdk-devel || true
+        sudo yum -y erase vpp-ext-deps || true
+    fi
 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