From: Ed Kern <ejk@cisco.com>
Date: Thu, 18 Jul 2019 21:18:11 +0000 (-0600)
Subject: VPP: centos removing correct repo file
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=5a7fdee2486c23fe5e4ede8ea5967250ebf39395;p=ci-management.git

VPP: centos removing correct repo file

Centos now matching ubuntu bionic behaviour when on non master
branch

Change-Id: I5fb7ab4074ed9882bd44931ce866eab4add6539d
Signed-off-by: Ed Kern <ejk@cisco.com>
---

diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
index f761441b5..c98f6def4 100644
--- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh
+++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
@@ -29,7 +29,11 @@ function setup {
                 echo "Deleting: /etc/yum.repos.d/fdio-master.repo"
                 sudo rm /etc/yum.repos.d/fdio-master.repo
             fi
-            curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh | sudo bash
+            if ! [ "${STREAM}" == "master" ]; then
+                echo "tree not master deleting packagecloud repo pointer"
+                sudo rm  -f /etc/yum.repos.d/fdio_master.repo
+                curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh | sudo bash
+            fi
             sudo yum -y install vpp-dpdk-devel || true
             sudo yum -y install vpp-ext-deps || true
         elif [ "$OS_ID" == "opensuse" ]; then