From 3a98fda152e9b068ab1a35275a202cfca05f0ba6 Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Tue, 3 Jan 2017 21:46:39 +0530 Subject: [PATCH] nfs-ganesha: ceph fsals ON, change git repo url Signed-off-by: Ali Maredia --- nfs-ganesha/build/build_deb | 2 +- nfs-ganesha/build/build_rpm | 2 +- nfs-ganesha/config/definitions/nfs-ganesha.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nfs-ganesha/build/build_deb b/nfs-ganesha/build/build_deb index 046e0539..933508c5 100644 --- a/nfs-ganesha/build/build_deb +++ b/nfs-ganesha/build/build_deb @@ -29,7 +29,7 @@ mkdir build cd build # make source tarball -cmake -DCMAKE_BUILDER_TYPE=Maintainer $WORKSPACE/nfs-ganesha/src && make dist || exit 0 +cmake -DCMAKE_BUILDER_TYPE=Maintainer -DUSE_FSAL_RGW=YES -DUSE_FSAL_CEPH=YES $WORKSPACE/nfs-ganesha/src && make dist || exit 0 ## Get some basic information about the system and the repository DEB_ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH) diff --git a/nfs-ganesha/build/build_rpm b/nfs-ganesha/build/build_rpm index 690a1300..09799bda 100644 --- a/nfs-ganesha/build/build_rpm +++ b/nfs-ganesha/build/build_rpm @@ -36,7 +36,7 @@ mkdir build cd build # generate .spec file and make source tarball -cmake -DCMAKE_BUILDER_TYPE=Maintainer $WORKSPACE/nfs-ganesha/src && make dist || exit 0 +cmake -DCMAKE_BUILDER_TYPE=Maintainer -DUSE_FSAL_RGW=YES -DUSE_FSAL_CEPH=YES $WORKSPACE/nfs-ganesha/src && make dist || exit 0 ## Create the source rpm echo "Building SRPM" diff --git a/nfs-ganesha/config/definitions/nfs-ganesha.yml b/nfs-ganesha/config/definitions/nfs-ganesha.yml index acec1daf..baec604f 100644 --- a/nfs-ganesha/config/definitions/nfs-ganesha.yml +++ b/nfs-ganesha/config/definitions/nfs-ganesha.yml @@ -84,7 +84,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if scm: - git: - url: git@github.com/nfs-ganesha/nfs-ganesha.git + url: https://github.com/nfs-ganesha/nfs-ganesha.git # Use the SSH key attached to the ceph-jenkins GitHub account. credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' branches: @@ -95,7 +95,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if scm: - git: - url: git@github.com/nfs-ganesha/nfs-ganesha-debian.git + url: https://github.com/nfs-ganesha/nfs-ganesha-debian.git # Use the SSH key attached to the ceph-jenkins GitHub account. credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' branches: -- 2.39.5