From: Ali Maredia <amaredia@redhat.com>
Date: Thu, 26 Jan 2017 19:38:15 +0000 (-0500)
Subject: nfs-ganesha: fixes to enable "Builds" section in shaman
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=15bc1361afe50d4e3d6f6e062f9780358154d9c2;p=ceph-build.git

nfs-ganesha: fixes to enable "Builds" section in shaman

Signed-off-by: Ali Maredia <amaredia@redhat.com>
---

diff --git a/nfs-ganesha/build/build_deb b/nfs-ganesha/build/build_deb
index 2356cbf9..38157964 100644
--- a/nfs-ganesha/build/build_deb
+++ b/nfs-ganesha/build/build_deb
@@ -122,6 +122,7 @@ fi
 echo Check the status of the repo at: https://shaman.ceph.com/api/repos/${chacra_endpoint}
 
 # update shaman with the completed build status
+SHA1=${GIT_COMMIT}
 update_build_status "completed" "nfs-ganesha" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 sudo rm -rf $WORKSPACE/dist
diff --git a/nfs-ganesha/build/build_rpm b/nfs-ganesha/build/build_rpm
index d076000c..0d31f347 100644
--- a/nfs-ganesha/build/build_rpm
+++ b/nfs-ganesha/build/build_rpm
@@ -78,7 +78,7 @@ echo "\"\"\"" >> nfs-ganesha.cfg
 echo "Building RPMs"
 sudo mock -r nfs-ganesha.cfg --define "dist .el7" --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 )
 
-VERSION=`grep -om 1 "[0-9]\.[0-9]-dev-[0-9]" $WORKSPACE/nfs-ganesha/src/build/include/config.h`
+VERSION=`grep -om 1 "[0-9]\.[0-9]-dev-[0-9]" $WORKSPACE/nfs-ganesha/build/include/config.h`
 chacra_endpoint="nfs-ganesha/${NFS_GANESHA_BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}"
 RPM_RELEASE=`grep Release $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec | sed 's/Release:[ \t]*//g' | cut -d '%' -f 1`
 RPM_VERSION=`grep Version $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec | sed 's/Version:[ \t]*//g'`
@@ -111,6 +111,7 @@ fi
 echo Check the status of the repo at: https://shaman.ceph.com/api/repos/${chacra_endpoint}
 
 # update shaman with the completed build status
+SHA1=${GIT_COMMIT}
 update_build_status "completed" "nfs-ganesha" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 sudo rm -rf $WORKSPACE/dist
diff --git a/nfs-ganesha/config/definitions/nfs-ganesha.yml b/nfs-ganesha/config/definitions/nfs-ganesha.yml
index c68074fb..7bdb47cf 100644
--- a/nfs-ganesha/config/definitions/nfs-ganesha.yml
+++ b/nfs-ganesha/config/definitions/nfs-ganesha.yml
@@ -37,6 +37,11 @@
           description: "The git branch (or tag) to build"
           default: "next"
 
+      - string:
+          name: BRANCH
+          description: "The git branch that will be posted to shaman"
+          default: $NFS_GANESHA_BRANCH
+
       - string:
           name: CEPH_SHA1
           description: "The SHA1 of the ceph branch"