missing \" for if condition
use qtip temp dir for tempfiles
Change-Id: I696b81b2e017f630051353f10b96f07fb85e2ec2
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}
-e NODE_NAME=${NODE_NAME} -e CI_DEBUG=${CI_DEBUG}"
ramfs=/tmp/qtip/ramfs
envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}
-e NODE_NAME=${NODE_NAME} -e CI_DEBUG=${CI_DEBUG}"
ramfs=/tmp/qtip/ramfs
+cfg_dir=$(dirname $ramfs)
dir_imgstore="${HOME}/imgstore"
ramfs_volume="$ramfs:/mnt/ramfs"
dir_imgstore="${HOME}/imgstore"
ramfs_volume="$ramfs:/mnt/ramfs"
-if [ ! -z $(df $ramfs | tail -n -1 | grep $ramfs) ]; then
+if [ ! -z "$(df $ramfs | tail -n -1 | grep $ramfs)" ]; then
sudo mount -t tmpfs -o size=32M tmpfs $ramfs
fi
# enable contro path in docker
sudo mount -t tmpfs -o size=32M tmpfs $ramfs
fi
# enable contro path in docker
-echo <<EOF > /tmp/ansible.cfg
+cat <<EOF > ${cfg_dir}/ansible.cfg
[defaults]
callback_whitelist = profile_tasks
[ssh_connection]
[defaults]
callback_whitelist = profile_tasks
[ssh_connection]
else
echo "The container ID is: ${container_id}"
QTIP_REPO=/home/opnfv/repos/qtip
else
echo "The container ID is: ${container_id}"
QTIP_REPO=/home/opnfv/repos/qtip
- docker cp /tmp/ansible.cfg ${container_id}:/home/opnfv/.ansible.cfg
+ docker cp ${cfg_dir}/ansible.cfg ${container_id}:/home/opnfv/.ansible.cfg
# TODO(zhihui_wu): use qtip cli to execute benchmark test in the future
docker exec -t ${container_id} bash -c "cd ${QTIP_REPO}/qtip/runner/ &&
python runner.py -d /home/opnfv/qtip/results/ -b all"
# TODO(zhihui_wu): use qtip cli to execute benchmark test in the future
docker exec -t ${container_id} bash -c "cd ${QTIP_REPO}/qtip/runner/ &&
python runner.py -d /home/opnfv/qtip/results/ -b all"