From e1480c0cb45480ffcfe8a5073c436cb6a253a2d2 Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Mon, 13 Mar 2017 14:35:22 -0400 Subject: [PATCH] nfs-ganesha: add flavors and assing BRANCH to NFS_GANESHA_BRANCH Signed-off-by: Ali Maredia --- nfs-ganesha/build/build_deb | 2 +- nfs-ganesha/build/build_rpm | 2 +- nfs-ganesha/build/setup | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nfs-ganesha/build/build_deb b/nfs-ganesha/build/build_deb index cde9a613..05c8136b 100644 --- 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 44f078b6..f19a1537 100644 --- 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 78c61c20..39f1a63d 100644 --- 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/` -- 2.39.5