From 149bea0a7637967d625995ed0ee10c8575009e7a Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Wed, 1 Mar 2017 12:13:32 -0700 Subject: Fix vpp merge jobs This patch switches to installing the vpp-dpkg-dev whenever possible rather than building it. This means no duplicative pushing of vpp-dpkg-dev, which should fix the merge jobs. It also should mean faster vpp builds since we generally won't need to build DPDK either. Change-Id: I8a892b053989d0c95e0605e8dc54a6b7a205dc0c Signed-off-by: Ed Warnicke --- jjb/scripts/setup_vpp_dpdk_dev_env.sh | 44 +++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 jjb/scripts/setup_vpp_dpdk_dev_env.sh (limited to 'jjb/scripts/setup_vpp_dpdk_dev_env.sh') diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh new file mode 100644 index 000000000..75c3ed1ff --- /dev/null +++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh @@ -0,0 +1,44 @@ +#!/bin/bash +set -e -o pipefail + +#!/bin/bash +set -e -o pipefail + +# Figure out what system we are running on +if [ -f /etc/lsb-release ];then + . /etc/lsb-release +elif [ -f /etc/redhat-release ];then + sudo yum install -y redhat-lsb + DISTRIB_ID=`lsb_release -si` + DISTRIB_RELEASE=`lsb_release -sr` + DISTRIB_CODENAME=`lsb_release -sc` + DISTRIB_DESCRIPTION=`lsb_release -sd` +fi +echo DISTRIB_ID: $DISTRIB_ID +echo DISTRIB_RELEASE: $DISTRIB_RELEASE +echo DISTRIB_CODENAME: $DISTRIB_CODENAME +echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION + +function setup { + echo "INSTALLING VPP-DPKG-DEV from apt/yum repo" + REPO_URL="${NEXUSPROXY}/content/repositories/fd.io.${REPO_NAME}" + echo "REPO_URL: ${REPO_URL}" + # Setup by installing vpp-dev and vpp-lib + if [ $DISTRIB_ID == "Ubuntu" ]; then + echo "deb ${REPO_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.list + sudo apt-get update + sudo apt-get -y --force-yes install vpp-dpdk-dev || true + elif [[ $DISTRIB_ID == "CentOS" ]]; then + sudo cat << EOF > fdio-master.repo +[fdio-master] +name=fd.io master branch latest merge +baseurl=${REPO_URL} +enabled=1 +gpgcheck=0 +EOF + sudo mv fdio-master.repo /etc/yum.repos.d/fdio-master.repo + sudo yum -y install vpp-dpdk-dev || true + fi +} + +setup \ No newline at end of file -- cgit 1.2.3-korg