xci: Adapt jobs to use common prepare-tests role

In order to activate more test tiers from functest and also
start running yardstick, we need to do the test preparation
at one go and then run what's supposed to be run.

This change is required for below changes to be verified
successfully
    https://gerrit.opnfv.org/gerrit/#/c/61639/
    https://gerrit.opnfv.org/gerrit/#/c/61641/

Change-Id: Ib3ae2241921383b77c23b05443325aa6240cc176
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>

diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index 3627d18..bfc68e2 100644 (file)
--- a/jjb/xci/xci-daily-jobs.yaml
+++ b/jjb/xci/xci-daily-jobs.yaml
@@ -320,7 +320,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 playbooks/prepare-functest.yml
+          ansible-playbook -i playbooks/dynamic_inventory.py playbooks/prepare-tests.yml
 
           echo "Run Functest"
           echo "---------------------------------------------------------------------------------"

diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh
index f46abe0..1e22c99 100755 (executable)
--- a/jjb/xci/xci-run-functest.sh
+++ b/jjb/xci/xci-run-functest.sh
@@ -47,7 +47,7 @@ fi
 export XCI_PATH=/home/devuser/releng-xci
 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-functest.yml"
+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"
 echo "Running functest"
 ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/run-functest.sh"
 # Record exit code