From b15d00f631f3dad1f9c51ba61a28e8cff5a7f87f Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Fri, 5 Oct 2018 09:24:33 +0200 Subject: [PATCH] [XCI] Add inventory to run prepare-tests.yml To pass functest healthcheck test in odl scenarios, some odl variables must be fetched. To do so, we require to know where opendaylight is deployed and that we can know using the dynamic_inventory.py file in OSA This is needed for this patch: https://gerrit.opnfv.org/gerrit/#/c/63175/ Change-Id: I04643ce93078bad53838e4d4e611f7684d4bd314 Signed-off-by: Manuel Buil --- jjb/xci/xci-daily-jobs.yaml | 4 +++- 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" -- 2.16.6