summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-01-06 17:24:12 -0500
committerTim Rozet <trozet@redhat.com>2016-01-06 17:24:12 -0500
commita075cccd604aeb3d90cdcbbab2d34dca7129d99e (patch)
tree0640019866b62d2a9b27ef8cfbb524669d5eb077
parent47ce22ce48ba9c607c0c780497a7e08c6d2f0640 (diff)
Fixes apex baremetal RPM install path for multiple scenarios
Change-Id: Icc7a0d7daed4db94c7717283c7a1d44a0939a280 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rw-r--r--jjb/apex/apex.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index c2f45448a..b41cedb9d 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -472,16 +472,17 @@
source opnfv.properties
RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL)
+ if [ ! -e "$RPM_INSTALL_PATH" ]; then
+ RPM_INSTALL_PATH=http://${OPNFV_RPM_URL}
+ fi
# update / install the new rpm
if rpm -q opnfv-apex > /dev/null; then
if sudo yum update -y $RPM_INSTALL_PATH | grep "does not update installed package"; then
sudo yum downgrade -y $RPM_INSTALL_PATH;
fi
- elif [ -e "$RPM_INSTALL_PATH" ]; then
- sudo yum install -y $RPM_INSTALL_PATH;
else
- sudo yum install -y http://${OPNFV_RPM_URL}
+ sudo yum install -y $RPM_INSTALL_PATH;
fi
# cleanup environment before we start