nfs-ganesha: add flavors and assing BRANCH to NFS_GANESHA_BRANCH

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

diff --git a/nfs-ganesha/build/build_deb b/nfs-ganesha/build/build_deb
index cde9a613d0e99152c2f8c57420bde50ca0d62623..05c8136b38cec557901d4d4d5e4d2f22f758b8d6 100644 (file)
--- a/nfs-ganesha/build/build_deb
+++ b/nfs-ganesha/build/build_deb
@@ -119,7 +119,7 @@ sudo pbuilder build \
 
 
 ## Upload the created RPMs to chacra
-chacra_endpoint="nfs-ganesha/${NFS_GANESHA_BRANCH}/${GIT_COMMIT}/${DISTRO}/${DIST}"
+chacra_endpoint="nfs-ganesha/${NFS_GANESHA_BRANCH}/${GIT_COMMIT}/${DISTRO}/${DIST}/flavors/${FLAVOR}"
 
 [ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags=""
 

diff --git a/nfs-ganesha/build/build_rpm b/nfs-ganesha/build/build_rpm
index 44f078b613bdc1cc34a5739fc194c32bfe376d3b..f19a1537498aaf26a8d194e62bfba188e91dfcab 100644 (file)
--- a/nfs-ganesha/build/build_rpm
+++ b/nfs-ganesha/build/build_rpm
@@ -93,7 +93,7 @@ echo "Building RPMs"
 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 -om 1 '[[:digit:]]\+\.[[:digit:]]\+-dev-[[:digit:]]\+' $WORKSPACE/nfs-ganesha/build/include/config.h`
-chacra_endpoint="nfs-ganesha/${NFS_GANESHA_BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}"
+chacra_endpoint="nfs-ganesha/${NFS_GANESHA_BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}/flavors/${FLAVOR}"
 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'`
 PACKAGE_MANAGER_VERSION="$RPM_VERSION-$RPM_RELEASE"

diff --git a/nfs-ganesha/build/setup b/nfs-ganesha/build/setup
index 78c61c20f5a6dea40477cd5e134cc910f4cdee74..39f1a63db3f3a11c63b62d7b3ce73a6b992e74e7 100644 (file)
--- a/nfs-ganesha/build/setup
+++ b/nfs-ganesha/build/setup
@@ -46,6 +46,9 @@ install_python_packages "pkgs[@]"
 
 NFS_GANESHA_BRANCH=`branch_slash_filter $NFS_GANESHA_BRANCH`
 CEPH_BRANCH=`branch_slash_filter $CEPH_BRANCH`
+BRANCH=${NFS_GANESHA_BRANCH}
+# set flavor as ceph branch libs are coming from
+FLAVOR="ceph_${CEPH_BRANCH}"
 
 # ask shaman which chacra instance to use
 chacra_url=`curl -f -u $SHAMAN_API_USER:$SHAMAN_API_KEY https://shaman.ceph.com/api/nodes/next/`