]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
nfs-ganesha-stable: various updates 944/head
authorAli Maredia <amaredia@redhat.com>
Mon, 8 Jan 2018 21:33:06 +0000 (16:33 -0500)
committerAli Maredia <amaredia@redhat.com>
Mon, 8 Jan 2018 22:22:07 +0000 (17:22 -0500)
- set RADOS_URL cmake options ON in rpm build script
- update various config parameters
- ensure removal of any old leftover ceph rpm packages

nfs-ganesha-stable/build/build_rpm
nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml

index a35a41a67e2457294f68b0f46a8c32f6a48ab37f..3dedc0fb13484ea7c40eaea22c0484077dca740f 100644 (file)
@@ -9,6 +9,9 @@ fi
 ## Get some basic information about the system and the repository
 RELEASE="$(lsb_release --short -r | cut -d '.' -f 1)" # sytem release
 
+# Make sure old rpms are not leftover on the system
+sudo yum remove -y librados2 librgw2 libcephfs2 librados-devel librgw-devel libcephfs-devel
+
 # Get .repo file from appropriate shaman build
 REPO_URL="https://shaman.ceph.com/api/repos/ceph/$CEPH_BRANCH/$CEPH_SHA1/$DISTRO/$RELEASE/flavors/default/repo"
 TIME_LIMIT=1200
@@ -67,7 +70,7 @@ 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 $WORKSPACE/nfs-ganesha/src && make dist || exit 1
+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
 
 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
index 2b2d7a5740699f8190674ea8a4735da16228d64d..43834828e648646a263f87855ea52427f2a1558e 100644 (file)
@@ -51,7 +51,7 @@
       - string:
           name: NTIRPC_BRANCH
           description: "The git branch (or tag) to build"
-          default: "next"
+          default: "v1.5"
 
       - string:
           name: NTIRPC_DEBIAN_BRANCH
@@ -66,7 +66,7 @@
       - string:
           name: CEPH_SHA1
           description: "The SHA1 of the ceph branch"
-          default: "f2337d1b42fa49dbb0a93e4048a42762e3dffbbf"
+          default: "cf0baeeeeba3b47f9427c6c97e2144b094b7e5ba"
 
       - string:
           name: CEPH_BRANCH