diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-09-03 11:46:15 +0200 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-09-03 14:23:23 +0200 |
| commit | 4f9c2dd1172ae6f87e607f4bf8c6d63803b1db19 (patch) | |
| tree | 1711c8a8f0a6dce316c459cf2f46e04a78692791 /jjb/xci | |
| parent | cad73d7ba7dffe634c389f9c8eaea9a97ba9b58d (diff) | |
xci: Execute prepare-tests.sh to prepare OPNFV VM
It also fixes the results directory where Functest log is cat from.
Change-Id: I3d8ea06d3741c70108cdb1c7f040969dbacf79a5
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'jjb/xci')
| -rw-r--r-- | jjb/xci/xci-daily-jobs.yaml | 5 | ||||
| -rwxr-xr-x | jjb/xci/xci-run-functest.sh | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml index bfc68e20d..07f02d198 100644 --- a/jjb/xci/xci-daily-jobs.yaml +++ b/jjb/xci/xci-daily-jobs.yaml @@ -311,7 +311,7 @@ cd $WORKSPACE/xci && ./xci-deploy.sh - echo "Prepare OPNFV VM for Functest" + echo "Prepare OPNFV VM for Tests" echo "---------------------------------------------------------------------------------" export XCI_PATH=$WORKSPACE export XCI_VENV=${XCI_PATH}/venv @@ -321,8 +321,7 @@ echo $var done < ${XCI_PATH}/.cache/xci.env && cd ${XCI_PATH}/xci && \ ansible-playbook -i playbooks/dynamic_inventory.py playbooks/prepare-tests.yml - - echo "Run Functest" + ssh root@192.168.122.2 "/root/prepare-tests.sh" echo "---------------------------------------------------------------------------------" - builder: diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh index 1e22c9979..992194ca3 100755 --- a/jjb/xci/xci-run-functest.sh +++ b/jjb/xci/xci-run-functest.sh @@ -47,18 +47,22 @@ 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-tests.yml" -echo "Running functest" +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 "Prepare OPNFV VM for Tests" +ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/prepare-tests.sh" +echo "Running Functest" ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/run-functest.sh" # Record exit code functest_exit=$? case ${DEPLOY_SCENARIO[0]} in os-*) - FUNCTEST_LOG=/root/results/functest.log + FUNCTEST_LOG=/root/functest-results/functest.log ;; k8-*) - FUNCTEST_LOG=/root/results/functest-kubernetes.log + FUNCTEST_LOG=/root/functest-results/functest-kubernetes.log ;; *) echo "Unable to determine the installer. Exiting!" |