From aea9ab231aa285269d2577d847385f721a12d6cd Mon Sep 17 00:00:00 2001 From: xudan Date: Wed, 10 May 2017 21:43:30 -0400 Subject: [PATCH] Bugfix: Error when create pod.yaml file JIRA: DOVETAIL-426 1. ImportError: No module named netaddr 2. rm: cannot remove '/home/opnfv/dovetail/userconfig/*': No such file or directory Change-Id: I81ad703667c798589855fdafc1668644e9a342b9 Signed-off-by: xudan --- jjb/dovetail/dovetail-run.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index cee9e5929..3ad67b60d 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -54,6 +54,7 @@ cd ${releng_repo}/modules sudo virtualenv venv source venv/bin/activate sudo pip install -e ./ >/dev/null +sudo pip install netaddr if [[ ${INSTALLER_TYPE} == compass ]]; then options="-u root -p root" @@ -66,7 +67,7 @@ fi pod_file_dir="/home/opnfv/dovetail/userconfig" if [ -d ${pod_file_dir} ]; then - sudo rm -r ${pod_file_dir}/* + sudo rm -rf ${pod_file_dir}/* else sudo mkdir -p ${pod_file_dir} fi -- 2.16.6