Merge "[XCI] Add inventory to run prepare-tests.yml"

diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index fcd4465..120c57e 100644 (file)
--- 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 992194c..5d3f3ce 100755 (executable)
--- 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"