From af91bff94b483b18901c8c2965eccd576652f317 Mon Sep 17 00:00:00 2001 From: Ed Kern Date: Mon, 29 Oct 2018 15:18:01 -0600 Subject: [PATCH] VPP: add sudo for non root user Add sudo to certain shell lines so they can run as non root user Change-Id: If3c2bc2afbd6a0f7f7cc8ee7fbd096525ac63a04 Signed-off-by: Ed Kern --- jjb/scripts/setup_vpp_dpdk_dev_env.sh | 4 ++-- jjb/scripts/setup_vpp_ubuntu_docker_test.sh | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh index 595e8b763..b40d7af68 100644 --- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh +++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh @@ -13,7 +13,7 @@ function setup { if [ "$OS_ID" == "ubuntu" ]; then if [ -f /etc/apt/sources.list.d/99fd.io.list ];then echo "Deleting: /etc/apt/sources.list.d/99fd.io.list" - rm /etc/apt/sources.list.d/99fd.io.list + sudo rm /etc/apt/sources.list.d/99fd.io.list fi curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh | sudo bash sudo apt-get -y --force-yes install vpp-dpdk-dev || true @@ -22,7 +22,7 @@ function setup { elif [ "$OS_ID" == "centos" ]; then if [ -f /etc/yum.repos.d/fdio-master.repo ]; then echo "Deleting: /etc/yum.repos.d/fdio-master.repo" - rm /etc/yum.repos.d/fdio-master.repo + sudo rm /etc/yum.repos.d/fdio-master.repo fi curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh | sudo bash sudo yum -y install vpp-dpdk-devel || true diff --git a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh index c9000df9f..4121d18bb 100644 --- a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh +++ b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh @@ -12,7 +12,7 @@ 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 + sudo mount -o remount /dev/shm -o size=512M || true echo "/dev/shm remounted" fi @@ -46,15 +46,15 @@ fi 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 fi fi -- 2.16.6