Merge "Add openSUSE jobs to VPP"

[ci-management.git] / 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
index 75c3ed1..0550825 100644 (file)
--- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh
+++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
@@ -1,44 +1,32 @@
 #!/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
+OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 
 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
+    if ! [ -z ${REPO_NAME} ]; then
+        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 || true
+            sudo apt-get -y --force-yes install vpp-dpdk-dev || true
+            sudo apt-get -y --force-yes install vpp-dpdk-dkms || 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
+            sudo mv fdio-master.repo /etc/yum.repos.d/fdio-master.repo
+            sudo yum -y install vpp-dpdk-devel || true
+        fi
     fi
 }
 
-setup
\ No newline at end of file
+setup