diff options
| author |   Ed Kern <ejk@cisco.com> | 2018-08-21 16:09:43 -0600 |
|---|---|---|
| committer | Ed Kern <ejk@cisco.com> | 2018-08-21 16:09:43 -0600 |
| commit | 0562585dadd9e47f6869d6015d864d9964983e62 (patch) | |
| tree | 639d49748574977bdcd555950713bcb62cbb4a65 | |
| parent | 50e56c270c667c2894f54c107f34a4eb6919c77b (diff) | |
VPP: expand arm builds to 2G shm
At request of test im expanding default shm
on arm builds to 2G from 512M
Change-Id: Ib0283fba5228083d578c66f9b382e5d4c06e72f3
Signed-off-by: Ed Kern <ejk@cisco.com>
| -rw-r--r-- | jjb/scripts/setup_vpp_ubuntu_arm_test.sh | 57 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 2 |
2 files changed, 58 insertions, 1 deletions
diff --git a/jjb/scripts/setup_vpp_ubuntu_arm_test.sh b/jjb/scripts/setup_vpp_ubuntu_arm_test.sh new file mode 100644 index 000000000..0769d4cf0 --- /dev/null +++ b/jjb/scripts/setup_vpp_ubuntu_arm_test.sh @@ -0,0 +1,57 @@ +#!/bin/bash +############################################################################## +# Copyright (c) 2018 The Linux Foundation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +############################################################################## +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=2G || 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' || 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 +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 + elif [ "${OS_ID}" == "centos" ]; then + yum -y erase vpp-dpdk-devel || true + yum clean all || true + elif [ "${OS_ID}" == "opensuse" ]; then + yum -y erase vpp-dpdk-devel || true + fi +fi diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 14a6a2b02..0b928a2ee 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -297,7 +297,7 @@ builders: - shell: - !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + !include-raw-escape: ../scripts/setup_vpp_ubuntu_arm_test.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_dpdk_dev_env.sh |