Install vpp-ext-deps rpms from local packages.

- In setup_vpp_dpdk_dev_env.sh if the required
  vpp-ext-deps package version is available in
  /root/Downloads, then install the local package
  instead of downloading and installing it from
  packagecloud.io.

Change-Id: Iffb8394288524732a2fd2795eec6324d85b17ef5
Signed-off-by: Dave Wallace <[email protected]>

diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
index 7ba87b3..cd5bab4 100644 (file)
--- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh
+++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
@@ -51,10 +51,21 @@ function setup {
         elif [ "${OS_ID,,}" == "centos" ] ; then
             if [ "${STREAM}" != "master" ] ; then
                 echo "stream '${STREAM}' is not master: replacing packagecloud repo list with stream specific list"
+                sudo yum -y erase vpp-ext-deps || true
+                sudo yum clean all || true
                 sudo rm -f /etc/yum.repos.d/fdio_master.repo
                 curl -s $INSTALL_URL/script.rpm.sh | sudo bash
             fi
-            sudo yum -y install vpp-ext-deps || true
+            local vpp_ext_deps_version="$(yum -q list vpp-ext-deps 2> /dev/null | mawk '/vpp-ext-deps/{print $2}')"
+            local vpp_ext_deps_pkg="$(yum -q list vpp-ext-deps 2> /dev/null | mawk '/vpp-ext-deps/{print $1}')"
+            vpp_ext_deps_pkg="/root/Downloads/${vpp_ext_deps_pkg/./-${vpp_ext_deps_version}.}.rpm"
+            if [ -f "$vpp_ext_deps_pkg" ] ; then
+                echo "Installing cached vpp-ext-deps pkg: $vpp_ext_deps_pkg"
+                sudo yum -y localinstall $vpp_ext_deps_pkg || true
+            else
+                echo "Installing vpp-ext-deps from packagecloud.io"
+                sudo yum -y install vpp-ext-deps || true
+            fi
         else
             echo "ERROR: Unsupported OS '$OS_ID'!"
         fi