diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/fuel/fuel-rtd-jobs.yaml | 12 | ||||
| -rw-r--r-- | jjb/sfc/sfc-project-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/xci/xci-daily-jobs.yaml | 4 | ||||
| -rwxr-xr-x | jjb/xci/xci-run-functest.sh | 4 |
4 files changed, 18 insertions, 6 deletions
diff --git a/jjb/fuel/fuel-rtd-jobs.yaml b/jjb/fuel/fuel-rtd-jobs.yaml new file mode 100644 index 000000000..b2e8397a2 --- /dev/null +++ b/jjb/fuel/fuel-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: fuel-rtd + project: fuel + project-name: fuel + + project-pattern: 'fuel' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-fuel/47205/' + rtd-token: '38f40bf6c08fd4bccb930871bc29b08404cf98b0' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/sfc/sfc-project-jobs.yaml b/jjb/sfc/sfc-project-jobs.yaml index f8ceef740..31f7aa6f5 100644 --- a/jjb/sfc/sfc-project-jobs.yaml +++ b/jjb/sfc/sfc-project-jobs.yaml @@ -77,6 +77,10 @@ name: sfc-unit-tests-and-docs builders: - shell: | + #!/bin/bash + virtualenv /var/tmp/sfc + source /var/tmp/sfc/bin/activate + pip install tox cd $WORKSPACE && tox ################################ diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml index 18b20f2ac..66cbb834f 100644 --- a/jjb/xci/xci-daily-jobs.yaml +++ b/jjb/xci/xci-daily-jobs.yaml @@ -341,9 +341,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 \ - -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \ - playbooks/prepare-tests.yml + ansible-playbook -i playbooks/dynamic_inventory.py playbooks/prepare-tests.yml ssh root@192.168.122.2 "/root/prepare-tests.sh" echo "---------------------------------------------------------------------------------" diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh index 610268c28..992194ca3 100755 --- a/jjb/xci/xci-run-functest.sh +++ b/jjb/xci/xci-run-functest.sh @@ -49,9 +49,7 @@ 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 \ - -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \ - playbooks/prepare-tests.yml" + 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" |