X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fscripts%2Fsetup_vpp_dpdk_dev_env.sh;h=e16b11c37a4ced7b449f6e161a8185c77e5436a3;hb=9c9b4bffc1219cbeda9b1b3cf2581639c6fe7612;hp=f36bcaad878d1d7578970b6344533e5c54ace9cd;hpb=f70b56deb3b825cdf69ab1d506fe37aa037fe9cf;p=ci-management.git

diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
index f36bcaad8..e16b11c37 100644
--- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh
+++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
@@ -1,20 +1,8 @@
 #!/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 {
     if ! [ -z ${REPO_NAME} ]; then
@@ -22,12 +10,12 @@ function setup {
         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
+        if [ "$OS_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
+        elif [ "$OS_ID" == "centos" ]; then
             sudo cat << EOF > fdio-master.repo
 [fdio-master]
 name=fd.io master branch latest merge