Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove verify job of viper on xenial. Now only bionic is enabled.
[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
3c75757
..
fe6a0fc
100644
(file)
--- 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)
# 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
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" ]; 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
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" ]; 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
fi
fi