Add ansible functional tests
ansible now directly depends on and uses openstacksdk rather than shade. Make sure we don't land patches that break ansible. Remove the installation of ansible from run-ansible-tests as it's specified in the tox.ini file already, and we'll get it installed via tox-siblings in the gate. Depends-On: https://review.openstack.org/570956 Change-Id: I35103b8c75100725caf7a8fd264b81d402bf1973
This commit is contained in:
parent
820c6c700b
commit
83d939dd43
32
.zuul.yaml
32
.zuul.yaml
@ -199,6 +199,36 @@
|
|||||||
OPENSTACKSDK_HAS_SWIFT: 0
|
OPENSTACKSDK_HAS_SWIFT: 0
|
||||||
OPENSTACKSDK_HAS_MAGNUM: 1
|
OPENSTACKSDK_HAS_MAGNUM: 1
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: openstacksdk-ansible-functional-devstack
|
||||||
|
parent: openstacksdk-functional-devstack
|
||||||
|
description: |
|
||||||
|
Run openstacksdk ansible functional tests against a master devstack
|
||||||
|
using released version of ansible.
|
||||||
|
vars:
|
||||||
|
tox_envlist: ansible
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: openstacksdk-ansible-devel-functional-devstack
|
||||||
|
parent: openstacksdk-ansible-functional-devstack
|
||||||
|
description: |
|
||||||
|
Run openstacksdk ansible functional tests against a master devstack
|
||||||
|
using git devel branch version of ansible.
|
||||||
|
branches: ^(devel|master)$
|
||||||
|
required-projects:
|
||||||
|
- name: github.com/ansible/ansible
|
||||||
|
override-checkout: devel
|
||||||
|
- name: openstack/openstacksdk
|
||||||
|
override-checkout: master
|
||||||
|
- name: openstack-dev/devstack
|
||||||
|
override-checkout: master
|
||||||
|
vars:
|
||||||
|
# test-matrix grabs branch from the zuul branch setting. If the job
|
||||||
|
# is triggered by ansible, that branch will be devel which doesn't
|
||||||
|
# make sense to devstack. Override so that we run the right thing.
|
||||||
|
test_matrix_branch: master
|
||||||
|
tox_install_siblings: true
|
||||||
|
|
||||||
- project-template:
|
- project-template:
|
||||||
name: openstacksdk-functional-tips
|
name: openstacksdk-functional-tips
|
||||||
check:
|
check:
|
||||||
@ -224,6 +254,8 @@
|
|||||||
- build-openstack-sphinx-docs:
|
- build-openstack-sphinx-docs:
|
||||||
vars:
|
vars:
|
||||||
sphinx_python: python3
|
sphinx_python: python3
|
||||||
|
- openstacksdk-ansible-devel-functional-devstack:
|
||||||
|
voting: false
|
||||||
- openstacksdk-functional-devstack
|
- openstacksdk-functional-devstack
|
||||||
- openstacksdk-functional-devstack-magnum:
|
- openstacksdk-functional-devstack-magnum:
|
||||||
voting: false
|
voting: false
|
||||||
|
@ -69,9 +69,6 @@ then
|
|||||||
git clone --recursive https://github.com/ansible/ansible.git ${ENVDIR}/ansible
|
git clone --recursive https://github.com/ansible/ansible.git ${ENVDIR}/ansible
|
||||||
fi
|
fi
|
||||||
source $ENVDIR/ansible/hacking/env-setup
|
source $ENVDIR/ansible/hacking/env-setup
|
||||||
else
|
|
||||||
echo "Installing Ansible from pip"
|
|
||||||
pip install ansible
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Run the shade Ansible tests
|
# Run the shade Ansible tests
|
||||||
|
3
tox.ini
3
tox.ini
@ -71,6 +71,9 @@ commands =
|
|||||||
# Need to pass some env vars for the Ansible playbooks
|
# Need to pass some env vars for the Ansible playbooks
|
||||||
basepython = {env:OPENSTACKSDK_TOX_PYTHON:python2}
|
basepython = {env:OPENSTACKSDK_TOX_PYTHON:python2}
|
||||||
passenv = HOME USER
|
passenv = HOME USER
|
||||||
|
deps =
|
||||||
|
{[testenv]deps}
|
||||||
|
ansible
|
||||||
commands = {toxinidir}/extras/run-ansible-tests.sh -e {envdir} {posargs}
|
commands = {toxinidir}/extras/run-ansible-tests.sh -e {envdir} {posargs}
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
|
Loading…
Reference in New Issue
Block a user