Bugfix: Dovetail CI failed with Permission denied 53/36453/3
authorxudan <xudan16@huawei.com>
Mon, 26 Jun 2017 01:46:35 +0000 (21:46 -0400)
committerxudan <xudan16@huawei.com>
Mon, 26 Jun 2017 03:37:24 +0000 (23:37 -0400)
JIRA: DOVETAIL-451

1. Dovetail CI jobs failed because of Permission denied.
2. The directory ${WORKSPACE}/cvp/pre_config is created with sudo privilege,
   so fetch_os_creds without sudo got Permission denied.
3. Remove the sudo when create directory ${WORKSPACE}/cvp/pre_config.

Change-Id: I802dc1cf8479b61929a9311800e65d357f4a7d34
Signed-off-by: xudan <xudan16@huawei.com>
jjb/dovetail/dovetail-run.sh

index 6bfb109..09bf6e1 100755 (executable)
@@ -7,14 +7,12 @@ set -e
 [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
 
 DOVETAIL_HOME=${WORKSPACE}/cvp
-if [ -d ${DOVETAIL_HOME} ]; then
-    sudo rm -rf ${DOVETAIL_HOME}/*
-else
-    sudo mkdir -p ${DOVETAIL_HOME}
-fi
+[ -d ${DOVETAIL_HOME} ] && sudo rm -rf ${DOVETAIL_HOME}
+
+mkdir -p ${DOVETAIL_HOME}
 
 DOVETAIL_CONFIG=${DOVETAIL_HOME}/pre_config
-sudo mkdir -p ${DOVETAIL_CONFIG}
+mkdir -p ${DOVETAIL_CONFIG}
 
 sshkey=""
 # The path of openrc.sh is defined in fetch_os_creds.sh
@@ -102,7 +100,8 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
 fi
 
 # sdnvpn test case needs to download this image first before running
-sudo wget -nc http://artifacts.opnfv.org/sdnvpn/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P ${DOVETAIL_CONFIG}
+echo "Download image ubuntu-16.04-server-cloudimg-amd64-disk1.img ..."
+wget -q -nc http://artifacts.opnfv.org/sdnvpn/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P ${DOVETAIL_CONFIG}
 
 opts="--privileged=true -id"