From: Tim Rozet <trozet@redhat.com>
Date: Wed, 6 Jan 2016 21:51:25 +0000 (-0500)
Subject: Fixes RPM install for baremetal
X-Git-Tag: brahmaputra.1.0~317
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=47ce22ce48ba9c607c0c780497a7e08c6d2f0640;p=releng.git

Fixes RPM install for baremetal

Currently the deploy builders assume that the RPM is already on the
machine under build_output directory.  This is true if the job was build
 or verify job.  But just with deploy, it is missing.  This patch allows
yum install from artifacts page directly.

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

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 97a70138c..c2f45448a 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -478,8 +478,10 @@
                if sudo yum update -y $RPM_INSTALL_PATH | grep "does not update installed package"; then
                    sudo yum downgrade -y $RPM_INSTALL_PATH;
                fi
-            else
+            elif [ -e "$RPM_INSTALL_PATH" ]; then
                sudo yum install -y $RPM_INSTALL_PATH;
+            else
+               sudo yum install -y http://${OPNFV_RPM_URL}
             fi
 
             # cleanup environment before we start