From: Tim Rozet <trozet@redhat.com>
Date: Wed, 6 Jan 2016 22:55:04 +0000 (-0500)
Subject: Fixes apex baremetal deploy case where desired RPM is already installed
X-Git-Tag: brahmaputra.1.0~315
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e65c585aec4c31834872bdb5450241cbac92f142;p=releng.git

Fixes apex baremetal deploy case where desired RPM is already installed

Change-Id: I025a3ad5ab1c3a4eed1306cb58071d7d75a7d9ad
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index b41cedb9d..ec88031b1 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -478,7 +478,9 @@
 
             # 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
+               if [ $(basename $OPNFV_RPM_URL) == $(rpm -q opnfv-apex).rpm ]; then
+                 echo "RPM is already installed"
+               elif sudo yum update -y $RPM_INSTALL_PATH | grep "does not update installed package"; then
                    sudo yum downgrade -y $RPM_INSTALL_PATH;
                fi
             else