VPP: packagecloud branch check

If branch is not master it removes preinstalled pointer
and runs packagecloud repo install script

Change-Id: I450b749a199cb431e04029174d28424969bccc91
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 c84bf81..087e535 100644 (file)
--- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh
+++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
@@ -11,11 +11,16 @@ function setup {
         echo "REPO_URL: ${REPO_URL}"
         # Setup by installing vpp-dev and vpp-lib
         if [ "$OS_ID" == "ubuntu" ]; then
+               if ! [ "${STREAM}" == "master" ]; then
+                       echo "tree not master deleting packagecloud repo pointer"
+                       sudo rm  -f /etc/apt/sources.list.d/fdio_master.list
+                       curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh | sudo bash
+               fi
             if [ -f /etc/apt/sources.list.d/99fd.io.list ];then
                 echo "Deleting: /etc/apt/sources.list.d/99fd.io.list"
                 sudo rm /etc/apt/sources.list.d/99fd.io.list
             fi
-            curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh | sudo bash
+
             sudo apt-get -y --force-yes install vpp-dpdk-dev || true
             sudo apt-get -y --force-yes install vpp-dpdk-dkms || true
             sudo apt-get -y --force-yes install vpp-ext-deps || true