diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-09-03 09:26:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-03 09:26:51 +0000 |
| commit | cad73d7ba7dffe634c389f9c8eaea9a97ba9b58d (patch) | |
| tree | 79080549b863d0acd36ea140b717fa8493f0a46c /jjb | |
| parent | 9c320823c2898c98628c8537c02d112a3f72d439 (diff) | |
| parent | 0f2c71c2dfac27dbc5b16a0d466dbdd8e902a3b3 (diff) | |
Merge "xci: Adapt jobs to use common prepare-tests role"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/xci/xci-daily-jobs.yaml | 2 | ||||
| -rwxr-xr-x | jjb/xci/xci-run-functest.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml index 3627d1806..bfc68e20d 100644 --- 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 f46abe043..1e22c9979 100755 --- 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 |