Merge "Sub repo for security gate, add lhinds as commiter"

[releng.git] / jjb / dovetail / dovetail-run.sh

diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index fb16f6a..3ad67b6 100755 (executable)
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -48,12 +48,13 @@ else
     exit 1
 fi
 
-pip install virtualenv
+sudo pip install virtualenv
 
 cd ${releng_repo}/modules
-virtualenv venv
+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"
@@ -65,12 +66,19 @@ else
 fi
 
 pod_file_dir="/home/opnfv/dovetail/userconfig"
+if [ -d ${pod_file_dir} ]; then
+    sudo rm -rf ${pod_file_dir}/*
+else
+    sudo mkdir -p ${pod_file_dir}
+fi
 cmd="sudo python ${releng_repo}/utils/create_pod_file.py -t ${INSTALLER_TYPE} -i ${INSTALLER_IP} ${options} -f ${pod_file_dir}/pod.yaml"
 echo ${cmd}
 ${cmd}
 
 deactivate
 
+cd ${WORKSPACE}
+
 if [ -f ${pod_file_dir}/pod.yaml ]; then
     echo "file ${pod_file_dir}/pod.yaml:"
     cat ${pod_file_dir}/pod.yaml