nfs-ganesha: ubuntu version and scrub mock before builds

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

diff --git a/nfs-ganesha/build/build_deb b/nfs-ganesha/build/build_deb
index 99e08dc6c535f91dc0b225c5b665005eb3f1cf48..a0a94d2e50eb137877a67c79316ade3936915a96 100644 (file)
--- a/nfs-ganesha/build/build_deb
+++ b/nfs-ganesha/build/build_deb
@@ -49,7 +49,7 @@ git submodule update --init || git submodule sync
 PACKAGE_MANAGER_VERSION="`git describe --long | sed 's/V//1'`-1${DIST}"
 
 # Version is in format X.XdevX-X-SHA1
-VERSION=`git describe --long | sed -e 's/V//1; s/-//1; s/-//1'`
+VERSION=`git describe --long | sed -e 's/V//1'`
 
 rm -rf .git
 

diff --git a/nfs-ganesha/build/build_rpm b/nfs-ganesha/build/build_rpm
index f591e771449eb5bf5b319685f139fee2c685c015..8b9e87cb3ee5152c81c569fbedead6dc26070a9c 100644 (file)
--- a/nfs-ganesha/build/build_rpm
+++ b/nfs-ganesha/build/build_rpm
@@ -35,6 +35,8 @@ fi
 # add shaman repos to /etc/yum.repos.d/ to install ceph libraries so enable
 #FSAL_CEPH (enabled by default) and FSAL_RGW in the .spec file when cmake command runs
 sudo cp $WORKSPACE/shaman.repo /etc/yum.repos.d/
+# for debugging
+cat /etc/yum.repos.d/shaman.repo
 xargs sudo yum install -y <<< "
 dbus-devel
 libacl-devel
@@ -87,9 +89,12 @@ sudo head -n -1 /etc/mock/${MOCK_TARGET}-${RELEASE}-${ARCH}.cfg > temp.cfg
 echo >> temp
 sudo cat temp.cfg $WORKSPACE/shaman.repo > nfs-ganesha.cfg
 echo "\"\"\"" >> nfs-ganesha.cfg
+# for debugging
+cat nfs-ganesha.cfg
 
 ## Build the binaries with mock
 echo "Building RPMs"
+sudo mock --verbose -r nfs-ganesha.cfg --scrub=all
 sudo mock --verbose -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 -R "#define GANESHA_VERSION \"" $WORKSPACE/nfs-ganesha/build/include/config.h | sed -e 's/#define GANESHA_VERSION "//1; s/"//1;'`