diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-11-05 10:40:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-11-05 10:40:05 +0000 |
| commit | c0c28db9493e0a01edb2050a3ce6ce72d6636071 (patch) | |
| tree | 4a55cb86f14b45406aa9233ce1305aa0380a874f /jjb | |
| parent | 738793f4c8cda893f84dba6081f952627af772d5 (diff) | |
| parent | 78575dc7ed9aadaecb9b639c1f43dc7f061706e6 (diff) | |
Merge "[XCI] Remove inventory for prepare-tests.yml"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/xci/xci-daily-jobs.yaml | 4 | ||||
| -rwxr-xr-x | jjb/xci/xci-run-functest.sh | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml index 18b20f2ac..66cbb834f 100644 --- a/jjb/xci/xci-daily-jobs.yaml +++ b/jjb/xci/xci-daily-jobs.yaml @@ -341,9 +341,7 @@ 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 \ - -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \ - playbooks/prepare-tests.yml + ansible-playbook -i playbooks/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 610268c28..992194ca3 100755 --- a/jjb/xci/xci-run-functest.sh +++ b/jjb/xci/xci-run-functest.sh @@ -49,9 +49,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 ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \ - playbooks/prepare-tests.yml" + cd releng-xci/xci && ansible-playbook -i playbooks/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" |