diff options
| -rw-r--r-- | jjb/scripts/cleanup_vpp_plugin_dev_env.sh | 4 | ||||
| -rw-r--r-- | jjb/scripts/setup_vpp_dpdk_dev_env.sh | 6 | ||||
| -rw-r--r-- | jjb/scripts/setup_vpp_ubuntu_arm_test.sh | 6 | ||||
| -rw-r--r-- | jjb/scripts/setup_vpp_ubuntu_docker_test.sh | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/jjb/scripts/cleanup_vpp_plugin_dev_env.sh b/jjb/scripts/cleanup_vpp_plugin_dev_env.sh index 3ef26a79b..2fcdf7016 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 vpp-dev-contrib + sudo dpkg -r vpp-dev vpp-lib vpp-dev vpp-lib vpp vpp-dpdk-dev vpp-dpdk-dkms vpp-dbg vpp-ext-deps elif [[ $DISTRIB_ID == "CentOS" ]]; then sudo rm -f /etc/yum.repos.d/fdio-master.repo - sudo yum -y remove vpp-devel vpp-lib vpp vpp-dev-contrib + sudo yum -y remove vpp-devel vpp-lib vpp vpp-ext-deps fi } diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh index f5a585888..595e8b763 100644 --- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh +++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh @@ -18,7 +18,7 @@ function setup { 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-dev-contrib || true + sudo apt-get -y --force-yes install vpp-ext-deps || 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" @@ -26,7 +26,7 @@ function setup { 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-dev-contrib || true + sudo yum -y install vpp-ext-deps || true elif [ "$OS_ID" == "opensuse" ]; then REPO_URL="${NEXUSPROXY}/content/repositories/fd.io.${REPO_NAME}" echo "REPO_URL: ${REPO_URL}" @@ -39,7 +39,7 @@ 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-dev-contrib || true + sudo yum -y install vpp-ext-deps || true fi fi } diff --git a/jjb/scripts/setup_vpp_ubuntu_arm_test.sh b/jjb/scripts/setup_vpp_ubuntu_arm_test.sh index af01f0e6e..45226d309 100644 --- a/jjb/scripts/setup_vpp_ubuntu_arm_test.sh +++ b/jjb/scripts/setup_vpp_ubuntu_arm_test.sh @@ -48,13 +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 + apt-get -y remove vpp-ext-deps || true elif [ "${OS_ID}" == "centos" ]; then yum -y erase vpp-dpdk-devel || true - yum -y erase vpp-dev-contrib || 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-dev-contrib || true + yum -y erase vpp-ext-deps || true fi fi diff --git a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh index f0a87ff32..c9000df9f 100644 --- a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh +++ b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh @@ -48,13 +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 + apt-get -y remove vpp-ext-deps || true elif [ "${OS_ID}" == "centos" ]; then yum -y erase vpp-dpdk-devel || true - yum -y erase vpp-dev-contrib || 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-dev-contrib || true + yum -y erase vpp-ext-deps || true fi fi |