From: Ed Warnicke <hagbard@gmail.com>
Date: Fri, 14 Sep 2018 23:18:14 +0000 (-0500)
Subject: Remoe fdio-master.repo file for centos builds to avoid
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=69c9e4abc451daa64ae6eea8cc446712cb672070;p=ci-management.git

Remoe fdio-repo file for centos builds to avoid
breakage on non-master branches

Change-Id: Ib03647b27f74b03e5cb9a6ba3d736d3889b39672
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
---

diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
index 93f44ace5..93c2f45db 100644
--- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh
+++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
@@ -15,6 +15,9 @@ function setup {
             sudo apt-get -y --force-yes install vpp-dpdk-dev || true
             sudo apt-get -y --force-yes install vpp-dpdk-dkms || true
         elif [ "$OS_ID" == "centos" ]; then
+            if [ -f /etc/yum.repos.d/fdio-master.repo ]; then
+                rm /etc/yum.repos.d/fdio-master.repo
+            fi
             curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh | sudo bash
             sudo yum -y install vpp-dpdk-devel || true
         elif [ "$OS_ID" == "opensuse" ]; then