Merge "Add INFO.yaml verify job"

[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 c9000df..90257f1 100644 (file)
--- a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
+++ b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
@@ -12,7 +12,10 @@ 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
 
@@ -40,21 +43,27 @@ elif [ "${OS_ID}" == "centos" ]; then
 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
-        apt-get -y remove vpp-dpdk-dev || true
-        apt-get -y remove vpp-dpdk-dkms || true
-        apt-get -y remove vpp-ext-deps || true
+        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
-        yum -y erase vpp-dpdk-devel || true
-        yum -y erase vpp-ext-deps || true
-        yum clean all || true
+        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
-        yum -y erase vpp-dpdk-devel || true
-        yum -y erase vpp-ext-deps || true
+        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