diff options
| author |   Juraj Linkeš <juraj.linkes@pantheon.tech> | 2020-07-06 15:59:14 +0200 |
|---|---|---|
| committer | Juraj Linkeš <juraj.linkes@pantheon.tech> | 2020-07-08 08:09:25 +0000 |
| commit | 34b30a1717e1e5c65524ce2db234dc1370344c4e (patch) | |
| tree | d92cd9121b6a2c4dfa09e549dfc7768f542f38e9 /jjb/scripts/setup_vpp_ubuntu_arm_test.sh | |
| parent | cea930f9bb0d339019cb84101ee451d63c3c0368 (diff) | |
Unify arm and x86 vpp jobs
There are two sets of scripts doing basically the same thing,
one set for arm and one for x86. Use the same scripts for both
x86 and arm jobs, remove the unnecessary ones and update the scripts
so that they work on both architectures.
Change-Id: Ie9c29578d0f6af41e65c0f4723bc248e664cb8dd
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
Diffstat (limited to 'jjb/scripts/setup_vpp_ubuntu_arm_test.sh')
| -rw-r--r-- | jjb/scripts/setup_vpp_ubuntu_arm_test.sh | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/jjb/scripts/setup_vpp_ubuntu_arm_test.sh b/jjb/scripts/setup_vpp_ubuntu_arm_test.sh deleted file mode 100644 index 45226d30..00000000 --- a/jjb/scripts/setup_vpp_ubuntu_arm_test.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/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 - 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 - elif [ "${OS_ID}" == "opensuse" ]; then - yum -y erase vpp-dpdk-devel || true - yum -y erase vpp-ext-deps || true - fi -fi |