X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fscripts%2Fsetup_vpp_dpdk_dev_env.sh;h=f761441b5f4ba77077a9baed68c7536c5a2445b6;hb=06628ecd18bf7db7f2d648ce2740fa68644eb31e;hp=a4543d64a576f9a972594ff154007ace9fb5ac2e;hpb=0166b59678703235f55620442f4d076f1d58085f;p=ci-management.git

diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
index a4543d64a..f761441b5 100644
--- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh
+++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
@@ -11,22 +11,27 @@ 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"
-                rm /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-dev-contrib || true
+            sudo apt-get update -qq || true
+            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
         elif [ "$OS_ID" == "centos" ]; then
             if [ -f /etc/yum.repos.d/fdio-master.repo ]; then
                 echo "Deleting: /etc/yum.repos.d/fdio-master.repo"
-                rm /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
-            #sudo yum -y install vpp-dpdk-devel || true
-            sudo yum -y install vpp-dev-contrib || true
+            sudo yum -y install vpp-dpdk-devel || true
+            sudo yum -y install vpp-ext-deps || true
         elif [ "$OS_ID" == "opensuse" ]; then
             REPO_URL="${NEXUSPROXY}/content/repositories/fd.io.${REPO_NAME}"
             echo "REPO_URL: ${REPO_URL}"
@@ -38,8 +43,21 @@ enabled=1
 gpgcheck=0
 EOF
             sudo mv fdio-master.repo /etc/yum/repos.d/fdio-master.repo
-            #sudo yum -y install vpp-dpdk-devel || true
-            sudo yum -y install vpp-dev-contrib || true
+            sudo yum -y install vpp-dpdk-devel || true
+            sudo yum -y install vpp-ext-deps || true
+        elif [ "$OS_ID" == "opensuse-leap" ]; then
+            REPO_URL="${NEXUSPROXY}/content/repositories/fd.io.${REPO_NAME}"
+            echo "REPO_URL: ${REPO_URL}"
+            sudo cat << EOF > fdio-master.repo
+[fdio-master]
+name=fd.io master branch latest merge
+baseurl=${REPO_URL}
+enabled=1
+gpgcheck=0
+EOF
+            sudo mv fdio-master.repo /etc/yum/repos.d/fdio-master.repo
+            sudo yum -y install vpp-dpdk-devel || true
+            sudo yum -y install vpp-ext-deps || true
         fi
     fi
 }