diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-10-10 23:37:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-10 23:37:19 +0000 |
| commit | 247aae29c4509d084bb2410af2d8b43e6b7d99e3 (patch) | |
| tree | 6f5e4892343e08f0e08497e28f866db8eec532f5 | |
| parent | 314471903270b28495e420687f91860c922af7cb (diff) | |
| parent | 6008d34a3455cd28888f74bda104c48cf2374649 (diff) | |
Merge "Bug fix: Path to inventory wrong"
| -rw-r--r-- | jjb/xci/xci-daily-jobs.yaml | 2 | ||||
| -rwxr-xr-x | jjb/xci/xci-run-functest.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml index 120c57e98..6f1ce39a0 100644 --- a/jjb/xci/xci-daily-jobs.yaml +++ b/jjb/xci/xci-daily-jobs.yaml @@ -338,7 +338,7 @@ echo $var done < ${XCI_PATH}/.cache/xci.env && cd ${XCI_PATH}/xci && \ ansible-playbook -i playbooks/dynamic_inventory.py \ - -i /root/releng-xci/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \ + -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \ playbooks/prepare-tests.yml ssh root@192.168.122.2 "/root/prepare-tests.sh" echo "---------------------------------------------------------------------------------" diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh index 5d3f3ced4..610268c28 100755 --- a/jjb/xci/xci-run-functest.sh +++ b/jjb/xci/xci-run-functest.sh @@ -50,7 +50,7 @@ export XCI_VENV=${XCI_PATH}/venv ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; \ while read var; do declare -x \"\${var}\" 2>/dev/null; done < ${XCI_PATH}/.cache/xci.env && \ cd releng-xci/xci && ansible-playbook -i playbooks/dynamic_inventory.py \ - -i /root/releng-xci/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \ + -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \ playbooks/prepare-tests.yml" echo "Prepare OPNFV VM for Tests" ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/prepare-tests.sh" |