diff options
| author |   Manuel Buil <mbuil@suse.com> | 2018-10-19 08:42:34 +0200 |
|---|---|---|
| committer | Manuel Buil <mbuil@suse.com> | 2018-10-19 08:42:34 +0200 |
| commit | 78575dc7ed9aadaecb9b639c1f43dc7f061706e6 (patch) | |
| tree | f0723a1df75ebdbdb3ce1d9c00f2e8b7a41f75ec | |
| parent | 2e72f359deb0370c518729293c4d0e61b45aa7cc (diff) | |
[XCI] Remove inventory for prepare-tests.yml
We are finally fetching all ODL variables from inside the scenarios.
Therefore, we don't need to use the inventory:
${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py
Change-Id: I91d17cb899a037887bc97441a1c1e37ff57b4850
Signed-off-by: Manuel Buil <mbuil@suse.com>
| -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" |