From: Tim Rozet <trozet@redhat.com>
Date: Thu, 14 Jan 2016 17:29:06 +0000 (-0500)
Subject: apex: fixes jjb for rpm building
X-Git-Tag: brahmaputra.1.0~208
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=35e96b9144b259b5cd09cb773e4f8d2f2ce54610;p=releng.git

apex: fixes jjb for rpm building

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

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index aad8e6e77..01e04f914 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -292,6 +292,7 @@
         - trigger-builds:
           - project: 'apex-build-{stream}'
             git-revision: true
+            current-parameters: true
             block: true
         - trigger-builds:
           - project: 'apex-deploy-baremetal-{stream}'
@@ -364,7 +365,7 @@
             if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
               export OPNFV_ARTIFACT_VERSION="bramaputra.1.rc0"
             else
-              if [ "$ARTIFACT_VERSION" == "dev" ]; then
+              if echo $BUILD_TAG | grep "apex-verify" 1> /dev/null; then
                 export OPNFV_ARTIFACT_VERSION=dev${BUILD_NUMBER}
               elif [ "$ARTIFACT_VERSION" == "daily" ]; then
                 export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d")
@@ -475,7 +476,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