From 4e9f8847cae51d459bef08739cb06417d95899b9 Mon Sep 17 00:00:00 2001
From: Dan Radez <dradez@redhat.com>
Date: Thu, 15 Oct 2015 14:41:24 -0400
Subject: addressing the build directory correctly for apex props file
Change-Id: Iaf685fac554000ebb5c898295d09e58c86d1365a
Signed-off-by: Dan Radez <dradez@redhat.com>
---
jjb/apex/apex.yml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index e7f166a8a..b29bef6fc 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -240,6 +240,7 @@
# start the build
cd $WORKSPACE/ci
./build.sh $FLAGS -v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY
+ RPM_VERSION=$(grep Version $BUILD_DIRECTORY/../opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-')
# list the contents of BUILD_OUTPUT directory
ls -al $BUILD_DIRECTORY
# save information regarding artifact into file
@@ -249,9 +250,9 @@
echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)"
echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso"
echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)"
- echo "OPNFV_SRPM_URL=$GS_URL/opnfv-apex-$(grep Version build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-').src.rpm"
- echo "OPNFV_RPM_URL=$GS_URL/opnfv-apex-$(grep Version build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-').rpm"
- echo "OPNFV_RPM_MD5SUM=$(md5sum $BUILD_DIRECTORY/$(grep Version build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-').rpm)"
+ echo "OPNFV_SRPM_URL=$GS_URL/opnfv-apex-$RPM_VERSION.src.rpm"
+ echo "OPNFV_RPM_URL=$GS_URL/opnfv-apex-$RPM_VERSION.rpm"
+ echo "OPNFV_RPM_MD5SUM=$(md5sum $BUILD_DIRECTORY/opnfv-apex-$RPM_VERSION.rpm | cut -d' ' -f1)"
echo "OPNFV_BUILD_URL=$BUILD_URL"
) > $WORKSPACE/opnfv.properties
echo
--
cgit