xci: Run functest as part of xci-merge jobs

This is yet another messy work to get functest run for xci
as part of merge jobs.

The script is removed from xci-verify jobs in order not to
block patches by -1ing them.

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

diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh
index 4fbc6c4..b2421de 100755 (executable)
--- a/jjb/xci/xci-run-functest.sh
+++ b/jjb/xci/xci-run-functest.sh
@@ -27,4 +27,4 @@ if ! sed -n "/^- scenario: $DEPLOY_SCENARIO$/,/^$/p" $OPNFV_SCENARIO_REQUIREMENT
     exit 0
 fi
 
-echo "Hello World!"
+ssh -F $HOME/.ssh/xci-vm-config ${DISTRO}_xci_vm "cd releng-xci/xci && PATH=/home/devuser/.local/bin:$PATH ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/run-functest.yml"

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index af2432d..3c31456 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -253,7 +253,5 @@
 - builder:
     name: 'xci-verify-healthcheck-macro'
     builders:
-      - shell:
-          !include-raw: ./xci-run-functest.sh
       - shell:
           !include-raw: ./xci-cleanup.sh