X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fscripts%2Fsetup_vpp_ubuntu_docker_test.sh;h=fe6a0fcbc3495e184dc3307d96ea35754d1da7c0;hb=e93c44c34c1345a88d024ee12f7de27e5ff74060;hp=3c757578a783522383332fe259f0df746f9a0688;hpb=afbd4e1110a24760b922b6dd9d5838baf1b7f8cc;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 3c757578a..fe6a0fcbc 100644 --- a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh +++ b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh @@ -15,7 +15,14 @@ if ! [ -z ${DOCKER_TEST} ] ; then # 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 + 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 @@ -43,6 +50,9 @@ 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 @@ -59,5 +69,8 @@ if [ "${GERRIT_BRANCH}" != "master" ]; then 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