summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2016-11-16 02:33:49 +0000
committerxudan <xudan16@huawei.com>2016-11-16 02:33:49 +0000
commit2f059c25737d005e584505d014ecb47402fcf977 (patch)
tree33dd7f55bd3344cb78c5e9eb06fd1a48c5fc6fc2
parent64b221bee631cf52bf6a1109c16f9544eff58f80 (diff)
dovetail tool: cleanup the result directory before running
1. Jenkins will fail with error rm: cannot remove '/home/opnfv/dovetail/results': Device or resource busy 2. The reason is that Jenkins will mount this directory before running 3. The effective solution is removing all contents in this directory rather than removing this mounted directory JIRA: DOVETAIL-38 Change-Id: Ic32ea19341ad2048322ec11a4abc48e13019a7bb Signed-off-by: xudan <xudan16@huawei.com>
-rw-r--r--dovetail/utils/dovetail_logger.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/dovetail/utils/dovetail_logger.py b/dovetail/utils/dovetail_logger.py
index 9cd8719b..8be9c93f 100644
--- a/dovetail/utils/dovetail_logger.py
+++ b/dovetail/utils/dovetail_logger.py
@@ -31,8 +31,8 @@ import dovetail_utils as dt_utils
def clean_results_dir():
result_path = dovetail_config['result_dir']
if os.path.exists(result_path):
- cmd = 'sudo rm -rf %s' % (result_path)
- dt_utils.exec_cmd(cmd)
+ cmd = 'sudo rm -rf %s/*' % (result_path)
+ dt_utils.exec_cmd(cmd, exit_on_error=False)
clean_results_dir()