summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2017-05-10 21:43:30 -0400
committerxudan <xudan16@huawei.com>2017-05-10 23:15:47 -0400
commitaea9ab231aa285269d2577d847385f721a12d6cd (patch)
treee994612941e9f4653670f9299e8d50c2df8fd04f /jjb
parent8cd2907163979ffe9ef8c8f174f65c0f0e6e0edc (diff)
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 <xudan16@huawei.com>
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/dovetail/dovetail-run.sh3
1 files changed, 2 insertions, 1 deletions
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