summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-01-25 11:46:07 +0100
committerFatih Degirmenci <fdegir@gmail.com>2018-01-25 11:57:23 +0100
commit5f73ab5e7935451dba7fc27c9026136cdd835605 (patch)
treef8212a2ddb324ba22e7dc517237db92d4fcd2721
parentfcf7d31301c5535b82ebe02b7bd1a6fb68468256 (diff)
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>
-rwxr-xr-xjjb/xci/xci-run-functest.sh2
-rw-r--r--jjb/xci/xci-verify-jobs.yml2
2 files changed, 1 insertions, 3 deletions
diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh
index 4fbc6c40d..b2421de32 100755
--- 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 af2432dd0..3c314568f 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -254,6 +254,4 @@
name: 'xci-verify-healthcheck-macro'
builders:
- shell:
- !include-raw: ./xci-run-functest.sh
- - shell:
!include-raw: ./xci-cleanup.sh