From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 2 Sep 2016 16:16:45 +0000 (-0400)
Subject: ceph-dev-build: parse and set a correct representation of 'version' for RPMs using... 
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F460%2Fhead;p=ceph-build.git

ceph-dev-build: parse and set a correct representation of 'version' for RPMs using the spec file

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm
index f445bca3..14a82c95 100644
--- a/ceph-dev-build/build/build_rpm
+++ b/ceph-dev-build/build/build_rpm
@@ -100,6 +100,14 @@ cd $releasedir/$cephver || exit 1
 # modify the spec file so that it understands we are dealing with a different directory
 sed -i "s/^%setup.*/%setup -q -n %{name}-$vers/" ceph.spec
 
+# This is needed because the 'version' this job gets from upstream contains chars
+# that are not legal for an RPM file. These are already converted in the spec file whic
+# is what is consumed to create the RPM binary. Parse these values there so that they can
+# be reported as part of the build metadata
+RPM_RELEASE=`grep Release ceph.spec | sed 's/Release:[ \t]*//g' | cut -d '%' -f 1`
+RPM_VERSION=`grep Version ceph.spec | sed 's/Version:[ \t]*//g'`
+PACKAGE_MANAGER_VERSION="$RPM_VERSION-$RPM_RELEASE"
+
 # Set up build area
 BUILDAREA=./rpm/$dist
 mkdir -p ${BUILDAREA}/{SOURCES,SRPMS,SPECS,RPMS,BUILD}
@@ -229,7 +237,7 @@ if [ "$THROWAWAY" = false ] ; then
     cat > $WORKSPACE/repo-extra.json << EOF
 {
     "version":"$vers",
-    "package_manager_version":"$vers",
+    "package_manager_version":"$PACKAGE_MANAGER_VERSION",
     "build_url":"$BUILD_URL",
     "root_build_cause":"$ROOT_BUILD_CAUSE",
     "node_name":"$NODE_NAME",