Fix install vpp to stable/1901 release

Change-Id: I0aa3fdd1220c67997c319e486829b12328945add
Signed-off-by: Hongjun Ni <[email protected]>

diff --git a/jjb/sweetcomb/include-raw-sweetcomb-build.sh b/jjb/sweetcomb/include-raw-sweetcomb-build.sh
index 30e42c4..ac743d8 100644 (file)
--- a/jjb/sweetcomb/include-raw-sweetcomb-build.sh
+++ b/jjb/sweetcomb/include-raw-sweetcomb-build.sh
@@ -8,6 +8,30 @@ OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\
 echo OS_ID: $OS_ID
 echo OS_VERSION_ID: $OS_VERSION_ID
 
+function setup {
+    if ! [ -z ${REPO_NAME} ]; then
+        echo "INSTALLING VPP-DPKG-DEV from apt/yum repo"
+        REPO_URL="https://packagecloud.io/fdio/${STREAM}"
+        echo "REPO_URL: ${REPO_URL}"
+        # Setup by installing vpp-dev and vpp-lib
+        if [ "$OS_ID" == "ubuntu" ]; then
+            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
+        elif [ "$OS_ID" == "centos" ]; then
+            if [ -f /etc/yum.repos.d/fdio-master.repo ]; then
+                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
+        fi
+    fi
+}
+
+setup
+
 echo "Building using \"make build-root/build.sh\""
 [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes install-dep
 [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes install-dep-extra