Merge "Do not skip commit-message-only checkstyle"

[ci-management.git] / jjb / scripts / setup_vpp_dpdk_dev_env.sh

diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
index 595e8b7..c98f6de 100644 (file)
--- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh
+++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
@@ -11,20 +11,29 @@ 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 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
+            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
-            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-ext-deps || true
         elif [ "$OS_ID" == "opensuse" ]; then
@@ -36,6 +45,19 @@ 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
+        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