Remoe fdio-master.repo file for centos builds to avoid 30/14830/1
authorEd Warnicke <hagbard@gmail.com>
Fri, 14 Sep 2018 23:18:14 +0000 (18:18 -0500)
committerEd Warnicke <hagbard@gmail.com>
Fri, 14 Sep 2018 23:18:14 +0000 (18:18 -0500)
breakage on non-master branches

Change-Id: Ib03647b27f74b03e5cb9a6ba3d736d3889b39672
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
jjb/scripts/setup_vpp_dpdk_dev_env.sh

index 93f44ac..93c2f45 100644 (file)
@@ -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