From: Ed Warnicke <eaw@cisco.com>
Date: Wed, 8 Nov 2017 21:14:52 +0000 (-0700)
Subject: Use OD_ID instead of the defunct DISTRIB_ID
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=2d321aadf6a69e5ed1fa1b27d75333404a94224f;p=ci-management.git

Use OD_ID instead of the defunct DISTRIB_ID

Change-Id: I41045c8ff1b43dd28731658c4c5a69eaeed43f19
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---

diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
index 055082538..3d337efcc 100644
--- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh
+++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
@@ -10,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