diff options
| -rw-r--r-- | jjb/fuel/fuel-daily-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/qtip/helpers/validate-deploy.sh | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml index 12456ddbb..32abad624 100644 --- a/jjb/fuel/fuel-daily-jobs.yml +++ b/jjb/fuel/fuel-daily-jobs.yml @@ -747,7 +747,7 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-zte-pod2-daily-master-trigger' triggers: - - timed: '0 18 * * *' + - timed: '' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-zte-pod2-daily-master-trigger' triggers: 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" |