summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2020-11-05 12:56:55 +0000
committerGerrit Code Review <gerrit@fd.io>2020-11-05 12:56:55 +0000
commit6891b5e79dd691ce60ae62633c1196fbd64eb20f (patch)
tree90084f3bb7642582cb2db908242e356b43d3dfaf
parent768d8e92082ca4c226bf677f0d17631d4983586c (diff)
parent1b260f6fd359d9902114107208af4214f8bd58d5 (diff)
Merge "Install vpp-ext-deps rpms from local packages."
-rw-r--r--jjb/scripts/setup_vpp_dpdk_dev_env.sh13
1 files changed, 12 insertions, 1 deletions
diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
index 7ba87b3a..cd5bab44 100644
--- 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