nfs-ganesha: change CMAKE_BUILD_TYPE, add checks

- change CMAKE_BUILD_TYPE to RelWithDebInfo
- include checks to make sure packages are installed
on the machines and necessary FSAL packages are built
- update $CEPH_VERSION to latest luminous

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

diff --git a/nfs-ganesha-stable/build/build_rpm b/nfs-ganesha-stable/build/build_rpm
index 48a1f4e86c6d9ef03a8a68861442746c0fe94eb1..5bc9b89cfbdb6571aa53dd0f75c03ffab131113d 100644 (file)
--- a/nfs-ganesha-stable/build/build_rpm
+++ b/nfs-ganesha-stable/build/build_rpm
@@ -74,11 +74,11 @@ mkdir build
 cd build
 
 # generate .spec file, edit .spec file for correct versions of libs and make source tarball
-cmake -DCMAKE_BUILD_TYPE=Maintainer -DUSE_FSAL_GLUSTER=OFF -DUSE_FSAL_CEPH=ON -DUSE_FSAL_RGW=ON -DRADOS_URLS=ON -DUSE_RADOS_RECOV=ON $WORKSPACE/nfs-ganesha/src && make dist || exit 1
+cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTRICT_PACKAGE=ON -DUSE_FSAL_ZFS=OFF -DUSE_FSAL_GLUSTER=OFF -DUSE_FSAL_CEPH=ON -DUSE_FSAL_RGW=ON -DRADOS_URLS=ON -DUSE_RADOS_RECOV=ON $WORKSPACE/nfs-ganesha/src && make dist || exit 1
 
 sed -i 's/libcephfs1-devel/libcephfs-devel/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec
 sed -i 's/librgw2-devel/librgw-devel/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec
-sed -i 's/CMAKE_BUILD_TPYE=Debug/CMAKE_BUILD_TYPE=Maintainer/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec
+sed -i 's/CMAKE_BUILD_TYPE=Debug/CMAKE_BUILD_TYPE=RelWithDebInfo/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec
 
 ## Create the source rpm
 echo "Building SRPM"
@@ -111,6 +111,18 @@ RPM_RELEASE=`grep Release $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec | sed 's/R
 RPM_VERSION=`grep Version $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec | sed 's/Version:[ \t]*//g'`
 PACKAGE_MANAGER_VERSION="$RPM_VERSION-$RPM_RELEASE"
 
+# check to make sure nfs-ganesha-ceph package built
+if [ ! -f $WORKSPACE/dist/RPMS/nfs-ganesha-ceph-*.rpm ]; then
+    echo "nfs-ganesha-ceph rpm not built!"
+    exit 1
+fi
+
+# check to make sure nfs-ganesha-rgw package built
+if [ ! -f $WORKSPACE/dist/RPMS/nfs-ganesha-rgw-*.rpm ]; then
+    echo "nfs-ganesha-rgw rpm not built!"
+    exit 1
+fi
+
 [ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags=""
 
 if [ "$THROWAWAY" = false ] ; then

diff --git a/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml b/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml
index 4acc442bb84ef9fab5d64f06871c52746b3b7e35..d7baecaeeb4e27ad109a4417a6c79e37a17122a2 100644 (file)
--- a/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml
+++ b/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml
@@ -46,7 +46,7 @@
       - string:
           name: NFS_GANESHA_BRANCH
           description: "The git branch (or tag) to build"
-          default: "V2.5-stable"
+          default: "V2.6-stable"
 
       - string:
           name: NTIRPC_BRANCH
@@ -66,7 +66,7 @@
       - string:
           name: CEPH_SHA1
           description: "The SHA1 of the ceph branch"
-          default: "cf0baeeeeba3b47f9427c6c97e2144b094b7e5ba"
+          default: "52085d5249a80c5f5121a76d6288429f35e4e77b"
 
       - string:
           name: CEPH_BRANCH
@@ -76,7 +76,7 @@
       - string:
           name: CEPH_VERSION
           description: "The version of Ceph to specify for installing ceph libraries"
-          default: "12.2.2"
+          default: "12.2.4"
 
       - string:
           name: DISTROS

diff --git a/nfs-ganesha/build/build_rpm b/nfs-ganesha/build/build_rpm
index ac3f8f486252e58b7003efbefe40c737872e2f30..1212fde787fa67788eac4afc36a8ef50ee88e176 100644 (file)
--- a/nfs-ganesha/build/build_rpm
+++ b/nfs-ganesha/build/build_rpm
@@ -68,11 +68,11 @@ mkdir build
 cd build
 
 # generate .spec file, edit .spec file for correct versions of libs and make source tarball
-cmake -DCMAKE_BUILD_TYPE=Maintainer -DUSE_FSAL_GLUSTER=OFF -DUSE_FSAL_CEPH=ON -DUSE_FSAL_RGW=ON -DRADOS_URLS=ON -DUSE_RADOS_RECOV=ON $WORKSPACE/nfs-ganesha/src && make dist || exit 1
+cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTRICT_PACKAGE=ON -DUSE_FSAL_ZFS=OFF -DUSE_FSAL_GLUSTER=OFF -DUSE_FSAL_CEPH=ON -DUSE_FSAL_RGW=ON -DRADOS_URLS=ON -DUSE_RADOS_RECOV=ON $WORKSPACE/nfs-ganesha/src && make dist || exit 1
 
 sed -i 's/libcephfs1-devel/libcephfs-devel/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec
 sed -i 's/librgw2-devel/librgw-devel/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec
-sed -i 's/CMAKE_BUILD_TPYE=Debug/CMAKE_BUILD_TYPE=Maintainer/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec
+sed -i 's/CMAKE_BUILD_TYPE=Debug/CMAKE_BUILD_TYPE=RelWithDebInfo/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec
 
 ## Create the source rpm
 echo "Building SRPM"
@@ -105,6 +105,19 @@ RPM_RELEASE=`grep Release $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec | sed 's/R
 RPM_VERSION=`grep Version $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec | sed 's/Version:[ \t]*//g'`
 PACKAGE_MANAGER_VERSION="$RPM_VERSION-$RPM_RELEASE"
 
+# check to make sure nfs-ganesha-ceph package built
+if [ ! -f $WORKSPACE/dist/RPMS/nfs-ganesha-ceph-*.rpm ]; then
+    echo "nfs-ganesha-ceph rpm not built!"
+    exit 1
+fi
+
+# check to make sure nfs-ganesha-rgw package built
+if [ ! -f $WORKSPACE/dist/RPMS/nfs-ganesha-rgw-*.rpm ]; then
+    echo "nfs-ganesha-rgw rpm not built!"
+    exit 1
+fi
+
+
 [ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags=""
 
 if [ "$THROWAWAY" = false ] ; then