From bf1398e514af4854e75da86c650121bb4f42707b Mon Sep 17 00:00:00 2001
From: Richard Scothern <richard.scothern@gmail.com>
Date: Fri, 5 Feb 2016 12:54:51 -0800
Subject: [PATCH] Attempt to unblock the ceph build process

Signed-off-by: Richard Scothern <richard.scothern@docker.com>
---
 contrib/ceph/ci-setup.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/ceph/ci-setup.sh b/contrib/ceph/ci-setup.sh
index d907cf5c3..14832760c 100755
--- a/contrib/ceph/ci-setup.sh
+++ b/contrib/ceph/ci-setup.sh
@@ -23,6 +23,9 @@ done
 
 retries=0
 until [ $retries -ge 5 ]; do
+    # apt-get can get stuck and hold the lock in some circumstances
+    # so preemptively kill it
+    kill `pgrep apt-get` || true
   ceph-deploy install --release hammer $NODE && break
   retries=$[$retries+1]
   sleep 30