VPP: centos removing correct repo file 31/20731/1
authorEd Kern <ejk@cisco.com>
Thu, 18 Jul 2019 21:18:11 +0000 (15:18 -0600)
committerEd Kern <ejk@cisco.com>
Thu, 18 Jul 2019 21:18:11 +0000 (15:18 -0600)
Centos now matching ubuntu bionic behaviour when on non master
branch

Change-Id: I5fb7ab4074ed9882bd44931ce866eab4add6539d
Signed-off-by: Ed Kern <ejk@cisco.com>
jjb/scripts/setup_vpp_dpdk_dev_env.sh

index f761441..c98f6de 100644 (file)
@@ -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