Run ansible devel sanity tests on py38
And fix some module typos. Disable voting for octavia jobs till investigation. Change-Id: Ie4cb69aa2337b0f951ac194cf456e4515dbc24fb
This commit is contained in:
parent
4160888887
commit
0441403c42
16
.zuul.yaml
16
.zuul.yaml
@ -18,6 +18,7 @@
|
|||||||
- tools/run-ansible-sanity.sh
|
- tools/run-ansible-sanity.sh
|
||||||
- tests/sanity/.*
|
- tests/sanity/.*
|
||||||
- contrib/.*
|
- contrib/.*
|
||||||
|
- .zuul.yaml
|
||||||
vars:
|
vars:
|
||||||
zuul_work_dir: src/opendev.org/openstack/ansible-collections-openstack
|
zuul_work_dir: src/opendev.org/openstack/ansible-collections-openstack
|
||||||
tox_envlist: ansible
|
tox_envlist: ansible
|
||||||
@ -259,7 +260,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: openstack-tox-linters-ansible-devel
|
name: openstack-tox-linters-ansible-devel
|
||||||
parent: openstack-tox-linters
|
parent: openstack-tox-linters
|
||||||
nodeset: ubuntu-bionic
|
nodeset: ubuntu-focal
|
||||||
description: |
|
description: |
|
||||||
Run openstack collections linter tests using the devel branch of ansible
|
Run openstack collections linter tests using the devel branch of ansible
|
||||||
# non-voting because we can't prevent ansible devel from breaking us
|
# non-voting because we can't prevent ansible devel from breaking us
|
||||||
@ -269,17 +270,23 @@
|
|||||||
override-checkout: devel
|
override-checkout: devel
|
||||||
vars:
|
vars:
|
||||||
tox_envlist: linters-2.11
|
tox_envlist: linters-2.11
|
||||||
|
python_version: 3.8
|
||||||
|
bindep_profile: test py38
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: openstack-tox-linters-ansible-2.11
|
name: openstack-tox-linters-ansible-2.11
|
||||||
parent: openstack-tox-linters
|
parent: openstack-tox-linters
|
||||||
nodeset: ubuntu-bionic
|
nodeset: ubuntu-focal
|
||||||
description: |
|
description: |
|
||||||
Run openstack collections linter tests using the 2.11 branch of ansible
|
Run openstack collections linter tests using the 2.11 branch of ansible
|
||||||
voting: true
|
voting: true
|
||||||
required-projects:
|
required-projects:
|
||||||
- name: github.com/ansible/ansible
|
- name: github.com/ansible/ansible
|
||||||
override-checkout: stable-2.11
|
override-checkout: stable-2.11
|
||||||
|
vars:
|
||||||
|
tox_envlist: linters-2.11
|
||||||
|
python_version: 3.8
|
||||||
|
bindep_profile: test py38
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: openstack-tox-linters-ansible-2.9
|
name: openstack-tox-linters-ansible-2.9
|
||||||
@ -393,6 +400,7 @@
|
|||||||
voting: false
|
voting: false
|
||||||
- ansible-collections-openstack-functional-devstack-octavia:
|
- ansible-collections-openstack-functional-devstack-octavia:
|
||||||
dependencies: *deps_unit_lint
|
dependencies: *deps_unit_lint
|
||||||
|
voting: false
|
||||||
|
|
||||||
- bifrost-collections-src:
|
- bifrost-collections-src:
|
||||||
voting: false
|
voting: false
|
||||||
@ -413,7 +421,7 @@
|
|||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- tox-pep8
|
- tox-pep8
|
||||||
# - openstack-tox-linters-ansible-2.11
|
- openstack-tox-linters-ansible-2.11
|
||||||
- openstack-tox-linters-ansible-2.9
|
- openstack-tox-linters-ansible-2.9
|
||||||
- ansible-collections-openstack-functional-devstack
|
- ansible-collections-openstack-functional-devstack
|
||||||
- ansible-collections-openstack-functional-devstack-releases
|
- ansible-collections-openstack-functional-devstack-releases
|
||||||
@ -424,7 +432,7 @@
|
|||||||
- ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11
|
- ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11
|
||||||
- ansible-collections-openstack-functional-devstack-train-ansible-2.11
|
- ansible-collections-openstack-functional-devstack-train-ansible-2.11
|
||||||
- ansible-collections-openstack-functional-devstack-queens-ansible-2.11
|
- ansible-collections-openstack-functional-devstack-queens-ansible-2.11
|
||||||
- ansible-collections-openstack-functional-devstack-octavia
|
# - ansible-collections-openstack-functional-devstack-octavia
|
||||||
- tripleo-ci-centos-8-standalone-osa
|
- tripleo-ci-centos-8-standalone-osa
|
||||||
|
|
||||||
periodic:
|
periodic:
|
||||||
|
@ -299,7 +299,10 @@ def main():
|
|||||||
required=False,
|
required=False,
|
||||||
type='bool',
|
type='bool',
|
||||||
aliases=['skip_update_of_driver_password'],
|
aliases=['skip_update_of_driver_password'],
|
||||||
deprecated_aliases=[dict(name='skip_update_of_driver_password', version='2.0.0')]
|
deprecated_aliases=[dict(
|
||||||
|
name='skip_update_of_driver_password',
|
||||||
|
version='2.0.0',
|
||||||
|
collection_name='openstack.cloud')]
|
||||||
),
|
),
|
||||||
state=dict(required=False, default='present', choices=['present', 'absent'])
|
state=dict(required=False, default='present', choices=['present', 'absent'])
|
||||||
)
|
)
|
||||||
|
@ -223,10 +223,10 @@ class HealthMonitorModule(OpenStackModule):
|
|||||||
expected_codes=dict(required=False, default="200"),
|
expected_codes=dict(required=False, default="200"),
|
||||||
admin_state_up=dict(required=False, default=True, type='bool'),
|
admin_state_up=dict(required=False, default=True, type='bool'),
|
||||||
state=dict(default='present', choices=['absent', 'present']),
|
state=dict(default='present', choices=['absent', 'present']),
|
||||||
http_method=dict(default="GET", requried=False, choices=["GET", "CONNECT", "DELETE",
|
http_method=dict(default="GET", required=False, choices=["GET", "CONNECT", "DELETE",
|
||||||
"HEAD", "OPTIONS", "PATCH",
|
"HEAD", "OPTIONS", "PATCH",
|
||||||
"POST", "PUT", "TRACE"]),
|
"POST", "PUT", "TRACE"]),
|
||||||
url_path=dict(default="/", requires=False),
|
url_path=dict(default="/", required=False),
|
||||||
type=dict(default='HTTP',
|
type=dict(default='HTTP',
|
||||||
choices=['HTTP', 'HTTPS', 'PING', 'SCTP', 'TCP', 'TLS-HELLO', 'UDP-CONNECT']))
|
choices=['HTTP', 'HTTPS', 'PING', 'SCTP', 'TCP', 'TLS-HELLO', 'UDP-CONNECT']))
|
||||||
|
|
||||||
|
@ -19,6 +19,9 @@ echo "Executing ansible-test sanity checks in ${ANSIBLE_COLLECTIONS_PATH}"
|
|||||||
|
|
||||||
trap "rm -rf ${ANSIBLE_COLLECTIONS_PATH}" err exit
|
trap "rm -rf ${ANSIBLE_COLLECTIONS_PATH}" err exit
|
||||||
|
|
||||||
|
PY_VER=$(python3 -c "from platform import python_version;print(python_version())" | cut -f 1,2 -d".")
|
||||||
|
echo "Running test with Python version ${PY_VER}"
|
||||||
|
|
||||||
rm -rf "${ANSIBLE_COLLECTIONS_PATH}"
|
rm -rf "${ANSIBLE_COLLECTIONS_PATH}"
|
||||||
mkdir -p ${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/openstack/cloud
|
mkdir -p ${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/openstack/cloud
|
||||||
cp -a ${TOXDIR}/{plugins,meta,scripts,tests,docs} ${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/openstack/cloud
|
cp -a ${TOXDIR}/{plugins,meta,scripts,tests,docs} ${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/openstack/cloud
|
||||||
@ -27,7 +30,7 @@ echo "Running ansible-test with version:"
|
|||||||
ansible --version
|
ansible --version
|
||||||
ansible-test sanity -v \
|
ansible-test sanity -v \
|
||||||
--venv \
|
--venv \
|
||||||
--python 3.6 \
|
--python ${PY_VER} \
|
||||||
--skip-test metaclass-boilerplate \
|
--skip-test metaclass-boilerplate \
|
||||||
--skip-test future-import-boilerplate \
|
--skip-test future-import-boilerplate \
|
||||||
plugins/ docs/ meta/ scripts/ tests/
|
plugins/ docs/ meta/ scripts/ tests/
|
||||||
|
2
tox.ini
2
tox.ini
@ -15,7 +15,7 @@ setenv =
|
|||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
LANG=en_US.UTF-8
|
LANG=en_US.UTF-8
|
||||||
LANGUAGE=en_US:en
|
LANGUAGE=en_US:en
|
||||||
LC_ALL=C
|
LC_ALL=en_US.utf-8
|
||||||
OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true}
|
OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true}
|
||||||
OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:true}
|
OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:true}
|
||||||
OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true}
|
OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true}
|
||||||
|
Loading…
Reference in New Issue
Block a user