nfs-ganesha-stable: debian builds using external ntirpc

- add option to switch nfs-ganesha-debian branch on
nfs-ganesha builds for shaman
- change build_debian to use an external ntirpc for
it's builds

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

diff --git a/nfs-ganesha-stable/build/build_deb b/nfs-ganesha-stable/build/build_deb
index 376b14d47e7a4bacafda0bf1648dd6e41f448de1..32c57130073e4c9b14cf88b20476b1c010ecd281 100644 (file)
--- a/nfs-ganesha-stable/build/build_deb
+++ b/nfs-ganesha-stable/build/build_deb
@@ -6,6 +6,56 @@ if test "$DISTRO" != "debian" -a "$DISTRO" != "ubuntu"; then
     exit 0
 fi
 
+
+cd $WORKSPACE/ntirpc
+NTIRPC_VERSION=`git describe --long | sed -e 's/v//1;'`
+
+rm -rf .git
+
+cd $WORKSPACE
+
+## Build the source tarball
+NTIRPC_ORIG_TAR_GZ="libntirpc_${NTIRPC_VERSION}.orig.tar.gz"
+tar czf ${NTIRPC_ORIG_TAR_GZ} ntirpc
+
+cd $WORKSPACE/nfs-ganesha-debian
+git checkout ${NTIRPC_DEBIAN_BRANCH}
+cd $WORKSPACE/ntirpc
+
+# add debian directory next to src
+cp -r $WORKSPACE/nfs-ganesha-debian/debian $WORKSPACE/ntirpc/
+
+## Prepare the debian files
+# Bump the changelog
+dch -v "$NTIRPC_VERSION-1${DIST}" "$NTIRPC_VERSION for download.ceph.com"
+
+# Create .dsc and source tarball, we don't care about signing changes or source package
+sudo dpkg-buildpackage -S -us -uc -d
+
+## Setup the pbuilder
+setup_pbuilder
+
+## Build with pbuilder
+echo "Building ntirpc debs"
+
+sudo pbuilder --clean
+
+# add missing packages and components to pbuilder
+sudo pbuilder update \
+    --extrapackages "cmake libkrb5-dev libjemalloc-dev debhelper apt-transport-https apt-utils ca-certificates" \
+    --components "main restricted universe multiverse" \
+    --override-config
+
+echo "Building debs for $DIST"
+sudo pbuilder build \
+    --buildresult $WORKSPACE/dist/ntirpc/deb/ \
+    $WORKSPACE/libntirpc_${NTIRPC_VERSION}-1${DIST}.dsc
+
+cd $WORKSPACE/dist/ntirpc/deb
+apt-ftparchive packages . > Packages
+
+cd $WORKSPACE
+
 REPO_URL="https://shaman.ceph.com/api/repos/ceph/$CEPH_BRANCH/$CEPH_SHA1/$DISTRO/$DIST/repo"
 TIME_LIMIT=1200
 INTERVAL=30
@@ -29,6 +79,10 @@ if [[ "$REPO_FOUND" -eq 0 ]]; then
   exit 1
 fi
 
+# make sure any shaman list file is removed. At some point if all nodes
+# are clean this will not be needed.
+sudo rm -f /etc/apt/sources.list.d/shaman*
+
 # We need this for system and to run the cmake
 sudo apt-get update
 
@@ -40,11 +94,10 @@ NORMAL_ARCH=$ARCH
 # create build status in shaman
 create_build_status "started" "nfs-ganesha-stable" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
-## Setup the pbuilder
-setup_pbuilder
+cd $WORKSPACE/nfs-ganesha-debian
+git checkout ${NFS_GANESHA_DEBIAN_BRANCH}
 
 cd $WORKSPACE/nfs-ganesha
-git submodule update --init || git submodule sync
 
 PACKAGE_MANAGER_VERSION="`git describe --long | sed 's/V//1'`-1${DIST}"
 
@@ -68,7 +121,7 @@ tar xzf ${NFS_GANESHA_ORIG_TAR_GZ}
 cd $WORKSPACE/nfs-ganesha
 
 # add debian directory next to src
-mv $WORKSPACE/nfs-ganesha-debian/debian $WORKSPACE/nfs-ganesha/
+cp -r $WORKSPACE/nfs-ganesha-debian/debian $WORKSPACE/nfs-ganesha/
 
 ## Get some basic information about the system and the repository
 DEB_ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
@@ -91,29 +144,18 @@ mkdir -p $WORKSPACE/dist/deb
 
 # add missing packages and components to pbuilder
 sudo pbuilder update \
-    --basetgz $PBUILDDIR/$DIST.tgz \
-    --distribution $DIST \
-    --extrapackages "apt-transport-https apt-utils ca-certificates" \
-    --components "main restricted universe multiverse"
-
-# add other mirror to pbuilder
-sudo pbuilder update \
-    --basetgz $PBUILDDIR/$DIST.tgz \
-    --distribution $DIST \
+    --extrapackages "apt-transport-https apt-utils ca-certificates librados-dev libcephfs-dev librgw-dev libntirpc-dev debhelper python-all" \
+    --components "main restricted universe multiverse" \
     --othermirror "${SHAMAN_MIRROR}" \
+    --othermirror "deb [trusted=yes] file://$WORKSPACE/dist/ntirpc/deb ./" \
+    --bindmounts "$WORKSPACE/dist/ntirpc/deb" \
     --override-config
 
-# use libcephfs and librgw from shaman
-sudo pbuilder update \
-    --basetgz $PBUILDDIR/$DIST.tgz \
-    --distribution $DIST \
-    --extrapackages "librados-dev libcephfs-dev librgw-dev"
-
 echo "Building debs for $DIST"
 sudo pbuilder build \
     --distribution $DIST \
     --basetgz $PBUILDDIR/$DIST.tgz \
-    --buildresult $WORKSPACE/dist/deb/ \
+    --buildresult $WORKSPACE/dist/nfs-ganesha/deb/ \
     --debbuildopts "-j`grep -c processor /proc/cpuinfo`" \
     $WORKSPACE/nfs-ganesha_${VERSION}-1${DIST}.dsc
 
@@ -128,7 +170,8 @@ chacra_repo_endpoint="${chacra_endpoint}/flavors/${FLAVOR}"
 
 if [ "$THROWAWAY" = false ] ; then
     # push binaries to chacra
-    find $WORKSPACE/dist/deb | egrep "*\.(changes|deb|dsc|gz)$" | egrep -v "(Packages|Sources|Contents)" | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${ARCH}/flavors/${FLAVOR}
+    find $WORKSPACE/dist/nfs-ganesha/deb | egrep "*\.(changes|deb|dsc|gz)$" | egrep -v "(Packages|Sources|Contents)" | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${ARCH}/flavors/${FLAVOR}
+    find $WORKSPACE/dist/ntirpc/deb | egrep "*\.(changes|deb|dsc|gz)$" | egrep -v "(Packages|Sources|Contents)" | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${ARCH}/flavors/${FLAVOR}
     # write json file with build info
     # version and package_manager version are needed for teuthology
     cat > $WORKSPACE/repo-extra.json << EOF
@@ -154,3 +197,4 @@ SHA1=${GIT_COMMIT}
 update_build_status "completed" "nfs-ganesha-stable" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 sudo rm -rf $WORKSPACE/dist
+

diff --git a/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml b/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml
index de2d13817410b91e5010c3109ce00fafc291aaad..6966859e972940f6193ad0644774b28f31fb89b2 100644 (file)
--- a/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml
+++ b/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml
@@ -15,10 +15,20 @@
       - git:
           url: https://github.com/nfs-ganesha/nfs-ganesha-debian.git
           branches:
-            - xenial-nfs-ganesha-ceph-fsals
+            - $NFS_GANESHA_DEBIAN_BRANCH
           skip-tag: true
           wipe-workspace: true
           basedir: "nfs-ganesha-debian"
+- scm:
+    name: ntirpc
+    scm:
+      - git:
+          url: https://github.com/nfs-ganesha/ntirpc.git
+          branches:
+            - $NTIRPC_BRANCH
+          skip-tag: true
+          wipe-workspace: true
+          basedir: "ntirpc"
 - job:
     name: nfs-ganesha-stable
     project-type: matrix
@@ -36,6 +46,21 @@
           description: "The git branch (or tag) to build"
           default: "V2.5-stable"
 
+      - string:
+          name: NTIRPC_BRANCH
+          description: "The git branch (or tag) to build"
+          default: "next"
+
+      - string:
+          name: NTIRPC_DEBIAN_BRANCH
+          description: "The git branch (or tag) for debian build scripts for ntirpc"
+          default: "xenial-libntirpc-1.5"
+
+      - string:
+          name: NFS_GANESHA_DEBIAN_BRANCH
+          description: "The git branch (or tag) for debian build scripts for nfs-ganesha"
+          default: "xenial-nfs-ganesha-download-dot-ceph-dot-com"
+
       - string:
           name: CEPH_SHA1
           description: "The SHA1 of the ceph branch"

diff --git a/nfs-ganesha/config/definitions/nfs-ganesha.yml b/nfs-ganesha/config/definitions/nfs-ganesha.yml
index aea120b714080300fd94ef178bfbf1d79ea91801..417bed3c73b0120f6b398e65338351e6e9692564 100644 (file)
--- a/nfs-ganesha/config/definitions/nfs-ganesha.yml
+++ b/nfs-ganesha/config/definitions/nfs-ganesha.yml
@@ -15,7 +15,7 @@
       - git:
           url: https://github.com/nfs-ganesha/nfs-ganesha-debian.git
           branches:
-            - xenial-nfs-ganesha-shaman
+            - $NFS_GANESHA_DEBIAN_BRANCH
           skip-tag: true
           wipe-workspace: true
           basedir: "nfs-ganesha-debian"
@@ -36,6 +36,11 @@
           description: "The git branch (or tag) to build"
           default: "next"
 
+      - string:
+          name: NFS_GANESHA_DEBIAN_BRANCH
+          description: "The git branch (or tag) for debian build scripts for nfs-ganesha"
+          default: "xenial-nfs-ganesha-shaman"
+
       - string:
           name: CEPH_SHA1
           description: "The SHA1 of the ceph branch"