Merge "Modify logs publisher"

[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 aeae56f..fe6a0fc 100644 (file)
--- a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
+++ b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
@@ -12,7 +12,17 @@ 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)
+        MEM=1024M
+        if [[ $(uname -m) == 'aarch64' ]]
+        then
+            # arm build are running with 16 cores, empirical evidence shows
+            # that 2048M is enough
+            MEM=2048M
+        fi
+               sudo mount -o remount /dev/shm -o size=${MEM} || true
         echo "/dev/shm remounted"
 fi
 
@@ -21,11 +31,46 @@ 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
 elif [ "${OS_ID}" == "opensuse" ]; then
     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