Add blkin support and a new gitbuilder for it

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/build-auto.sh b/build-auto.sh
index 2813d5f1eb4107a9c0547616bbd1595aa95bc526..dae20f72927aebf9b6c7e70f27bfd156a30e8de5 100755 (executable)
--- a/build-auto.sh
+++ b/build-auto.sh
@@ -20,6 +20,11 @@ if hostname | grep -q -- -gcov ; then
     export CEPH_EXTRA_CONFIGURE_ARGS="$CEPH_EXTRA_CONFIGURE_ARGS --enable-coverage"
 fi
 
+if hostname | grep -q -- -blkin ; then
+    echo "hostname has -blkin, will --with-blkin"
+    export CEPH_EXTRA_CONFIGURE_ARGS="$CEPH_EXTRA_CONFIGURE_ARGS --with-blkin"
+fi
+
 if hostname | grep -q -- ceph-deb- ; then
     exec $mydir/build-ceph-deb-native.sh
 fi

diff --git a/fabfile.py b/fabfile.py
index 996f9c6649685a99b46bee2beed9c9332e3c3822..03f22f91210b1675319ed58fcce35c2f30b20078 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -23,6 +23,7 @@ env.roledefs['gitbuilder_ceph_deb_native'] = [
 
 # the fancy ones
 env.roledefs['gitbuilder_auto'] = [
+    'ubuntu@gitbuilder-ceph-deb-trusty-amd64-blkin.front.sepia.ceph.com',
     'ubuntu@gitbuilder-ceph-deb-precise-amd64-basic.front.sepia.ceph.com',
 #    'ubuntu@gitbuilder-ceph-deb-precise-amd64-gcov.front.sepia.ceph.com',
     'ubuntu@gitbuilder-ceph-deb-precise-amd64-notcmalloc.front.sepia.ceph.com',