From: Sage Weil <sage@inktank.com>
Date: Fri, 23 Aug 2013 16:00:47 +0000 (-0700)
Subject: nuke: clean up stray firmware.git locks
X-Git-Tag: 1.1.0~1943^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=86caebbed7dd8a27d253b6e94345479e3d0b0284;p=teuthology.git

nuke: clean up stray firmware.git locks

These get lost occasionally and cause all firmware.git updates to
fail when the kernel task runs.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/teuthology/nuke.py b/teuthology/nuke.py
index 82389f99d..4aa1fc791 100644
--- a/teuthology/nuke.py
+++ b/teuthology/nuke.py
@@ -467,6 +467,11 @@ def nuke_helper(ctx, log):
         need_reboot = ctx.cluster.remotes.keys()
     synch_clocks(need_reboot, log)
 
+    log.info('Making sure firmware.git is not locked...')
+    ctx.cluster.run(args=[
+            'sudo', 'rm', '-f', '/lib/firmware/updates/.git/index.lock',
+            ])
+
     log.info('Reseting syslog output locations...')
     reset_syslog_dir(ctx, log)
     log.info('Clearing filesystem of test data...')