summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-01-14 12:29:06 -0500
committerTim Rozet <trozet@redhat.com>2016-01-14 12:29:06 -0500
commit35e96b9144b259b5cd09cb773e4f8d2f2ce54610 (patch)
tree2ffd02470c2bf7cf8896e1cfe06bf42e18c9319e /jjb
parentbc3bc54b4a554da78f68688ce1cec481f958b8e7 (diff)
apex: fixes jjb for rpm building
Change-Id: I4e2b81a3705fa095e1a5eef320317668ec001a20 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex.yml7
1 files changed, 5 insertions, 2 deletions
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