From edfe5eeda1f5de8226abadf6a39dc4305b39e4e0 Mon Sep 17 00:00:00 2001 From: Sam Lang Date: Fri, 1 Feb 2013 11:45:04 -0600 Subject: [PATCH] nuke: Fix cleanup of test dir Nuke used to remove /tmp/cephtest, now it tries to remove the test dir, which it may not have the name for. Instead of removing the test dir, we just remove the base directory for all test directories, which may or may not be /tmp/cephtest. Signed-off-by: Sam Lang --- teuthology/nuke.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/teuthology/nuke.py b/teuthology/nuke.py index 78d699126afc6..dfadd93df30b3 100644 --- a/teuthology/nuke.py +++ b/teuthology/nuke.py @@ -228,7 +228,7 @@ def remove_testing_tree(ctx, log): proc = remote.run( args=[ 'sudo', 'rm', '-rf', - get_testdir(ctx), + get_testdir_base(ctx), ], wait=False, ) @@ -373,6 +373,7 @@ def nuke_helper(ctx, log): # not powered on or can't get IPMI status. Try to power on console.power_on() # try to get status again, waiting for login prompt this time + log.info('checking console status of %s' % cname) if not console.check_status(100): log.error('Failed to get console status for %s, disabling console...' % cname) log.info('console ready on %s' % cname) -- 2.39.5