diff options
| author |   Julien <zhang.jun3g@zte.com.cn> | 2017-03-24 08:52:16 +0800 |
|---|---|---|
| committer | Julien <zhang.jun3g@zte.com.cn> | 2017-03-24 08:52:16 +0800 |
| commit | a3e87931c488c6f39e323f81573473accb4adfab (patch) | |
| tree | 235bdec04529b62a5def4ec05359199351b24db9 /jjb/qtip | |
| parent | e5b9b0e8f136df251d75a8b147d4546f88795d54 (diff) | |
fix qtip priority issue
missing \" for if condition
use qtip temp dir for tempfiles
Change-Id: I696b81b2e017f630051353f10b96f07fb85e2ec2
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Diffstat (limited to 'jjb/qtip')
| -rw-r--r-- | jjb/qtip/helpers/validate-deploy.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/jjb/qtip/helpers/validate-deploy.sh b/jjb/qtip/helpers/validate-deploy.sh index aa07986ce..9f3dbe414 100644 --- a/jjb/qtip/helpers/validate-deploy.sh +++ b/jjb/qtip/helpers/validate-deploy.sh @@ -11,6 +11,7 @@ set -e 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" @@ -28,12 +29,12 @@ if [ ! -d $ramfs ]; then mkdir -p $ramfs fi -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 -echo <<EOF > /tmp/ansible.cfg +cat <<EOF > ${cfg_dir}/ansible.cfg [defaults] callback_whitelist = profile_tasks [ssh_connection] @@ -51,7 +52,7 @@ if [ $(docker ps | grep 'opnfv/qtip' | wc -l) == 0 ]; then 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" |