diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-10-09 16:12:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-09 16:12:19 +0000 |
| commit | 0a31ec9e8c3dd0e7f99cc7ba4e9201c20a92e28e (patch) | |
| tree | 49a8602387e9d82560aae2d4ae08c69f6a17842f | |
| parent | 1c96a8bbf28f43b83b0bc3880910ec76d59bea84 (diff) | |
| parent | b15d00f631f3dad1f9c51ba61a28e8cff5a7f87f (diff) | |
Merge "[XCI] Add inventory to run prepare-tests.yml"
| -rw-r--r-- | jjb/xci/xci-daily-jobs.yaml | 4 | ||||
| -rwxr-xr-x | jjb/xci/xci-run-functest.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml index fcd4465cb..120c57e98 100644 --- a/jjb/xci/xci-daily-jobs.yaml +++ b/jjb/xci/xci-daily-jobs.yaml @@ -337,7 +337,9 @@ declare -x "\${var}" 2>/dev/null echo $var done < ${XCI_PATH}/.cache/xci.env && cd ${XCI_PATH}/xci && \ - ansible-playbook -i playbooks/dynamic_inventory.py playbooks/prepare-tests.yml + ansible-playbook -i playbooks/dynamic_inventory.py \ + -i /root/releng-xci/.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 992194ca3..5d3f3ced4 100755 --- a/jjb/xci/xci-run-functest.sh +++ b/jjb/xci/xci-run-functest.sh @@ -49,7 +49,9 @@ 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 playbooks/prepare-tests.yml" + cd releng-xci/xci && ansible-playbook -i playbooks/dynamic_inventory.py \ + -i /root/releng-xci/.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" echo "Running Functest" |