From 0166b59678703235f55620442f4d076f1d58085f Mon Sep 17 00:00:00 2001 From: Ed Kern Date: Tue, 18 Sep 2018 21:43:49 -0600 Subject: VPP: replace dpdk-dev with dev-contrib VPP internal package renaming requires setup changes Change-Id: I24b5132a0b73be99e6ef1e93a17c743f399bc1a1 Signed-off-by: Ed Kern --- jjb/scripts/cleanup_vpp_plugin_dev_env.sh | 4 ++-- jjb/scripts/setup_vpp_dpdk_dev_env.sh | 11 +++++++---- jjb/scripts/setup_vpp_ubuntu_arm_test.sh | 3 +++ jjb/scripts/setup_vpp_ubuntu_docker_test.sh | 3 +++ 4 files changed, 15 insertions(+), 6 deletions(-) (limited to 'jjb/scripts') diff --git a/jjb/scripts/cleanup_vpp_plugin_dev_env.sh b/jjb/scripts/cleanup_vpp_plugin_dev_env.sh index 2273335e2..3ef26a79b 100644 --- a/jjb/scripts/cleanup_vpp_plugin_dev_env.sh +++ b/jjb/scripts/cleanup_vpp_plugin_dev_env.sh @@ -20,10 +20,10 @@ function cleanup { # Setup by installing vpp-dev and vpp-lib if [ $DISTRIB_ID == "Ubuntu" ]; then sudo rm -f /etc/apt/sources.list.d/99fd.io.list - sudo dpkg -r vpp-dev vpp-lib vpp-dev vpp-lib vpp vpp-dpdk-dev vpp-dpdk-dkms vpp-dbg + sudo dpkg -r vpp-dev vpp-lib vpp-dev vpp-lib vpp vpp-dpdk-dev vpp-dpdk-dkms vpp-dbg vpp-dev-contrib elif [[ $DISTRIB_ID == "CentOS" ]]; then sudo rm -f /etc/yum.repos.d/fdio-master.repo - sudo yum -y remove vpp-devel vpp-lib vpp + sudo yum -y remove vpp-devel vpp-lib vpp vpp-dev-contrib fi } diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh index e6ee44cf5..a4543d64a 100644 --- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh +++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh @@ -16,15 +16,17 @@ function setup { 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 - sudo apt-get -y --force-yes install vpp-dpdk-dkms || true + #sudo apt-get -y --force-yes install vpp-dpdk-dev || true + #sudo apt-get -y --force-yes install vpp-dpdk-dkms || true + sudo apt-get -y --force-yes install vpp-dev-contrib || true 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 fi curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh | sudo bash - sudo yum -y install vpp-dpdk-devel || true + #sudo yum -y install vpp-dpdk-devel || true + sudo yum -y install vpp-dev-contrib || true elif [ "$OS_ID" == "opensuse" ]; then REPO_URL="${NEXUSPROXY}/content/repositories/fd.io.${REPO_NAME}" echo "REPO_URL: ${REPO_URL}" @@ -36,7 +38,8 @@ enabled=1 gpgcheck=0 EOF sudo mv fdio-master.repo /etc/yum/repos.d/fdio-master.repo - sudo yum -y install vpp-dpdk-devel || true + #sudo yum -y install vpp-dpdk-devel || true + sudo yum -y install vpp-dev-contrib || true fi fi } diff --git a/jjb/scripts/setup_vpp_ubuntu_arm_test.sh b/jjb/scripts/setup_vpp_ubuntu_arm_test.sh index 0769d4cf0..af01f0e6e 100644 --- a/jjb/scripts/setup_vpp_ubuntu_arm_test.sh +++ b/jjb/scripts/setup_vpp_ubuntu_arm_test.sh @@ -48,10 +48,13 @@ 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-dev-contrib || true elif [ "${OS_ID}" == "centos" ]; then yum -y erase vpp-dpdk-devel || true + yum -y erase vpp-dev-contrib || true yum clean all || true elif [ "${OS_ID}" == "opensuse" ]; then yum -y erase vpp-dpdk-devel || true + yum -y erase vpp-dev-contrib || true fi fi diff --git a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh index 2e1b1340d..f0a87ff32 100644 --- a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh +++ b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh @@ -48,10 +48,13 @@ 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-dev-contrib || true elif [ "${OS_ID}" == "centos" ]; then yum -y erase vpp-dpdk-devel || true + yum -y erase vpp-dev-contrib || true yum clean all || true elif [ "${OS_ID}" == "opensuse" ]; then yum -y erase vpp-dpdk-devel || true + yum -y erase vpp-dev-contrib || true fi fi -- cgit 1.2.3-korg