openstack
/
ansible-collections-openstack
Code Issues Proposed changes

Merge "Prepare for Ansible 2.11 tests"

This commit is contained in:
Zuul 2021-04-08 10:49:56 +00:00 committed by Gerrit Code Review
parent 58ec1030a4 17a1d72b1c
commit ab1a2a19d7
5 changed files with 52 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
.zuul.yaml
View File

@ -30,7 +30,7 @@
required-projects: required-projects:
- openstack/octavia - openstack/octavia
- name: github.com/ansible/ansible - name: github.com/ansible/ansible
override-checkout: stable-2.10 override-checkout: stable-2.11
files: files:
- ^ci/roles/loadbalancer/.*$ - ^ci/roles/loadbalancer/.*$
- ^plugins/modules/lb_health_monitor.py - ^plugins/modules/lb_health_monitor.py
@ -79,14 +79,14 @@
tox_envlist: ansible-2.9 tox_envlist: ansible-2.9
- job: - job:
name: ansible-collections-openstack-functional-devstack-ansible-2.10 name: ansible-collections-openstack-functional-devstack-ansible-2.11
parent: ansible-collections-openstack-functional-devstack parent: ansible-collections-openstack-functional-devstack
description: | description: |
Run openstack collections functional tests against a master devstack Run openstack collections functional tests against a master devstack
using master of openstacksdk and stable 2.10 branch of ansible using master of openstacksdk and stable 2.11 branch of ansible
required-projects: required-projects:
- name: github.com/ansible/ansible - name: github.com/ansible/ansible
override-checkout: stable-2.10 override-checkout: stable-2.11
vars: vars:
tox_envlist: ansible tox_envlist: ansible
@ -116,16 +116,16 @@
# Stable branches tests # Stable branches tests
- job: - job:
name: ansible-collections-openstack-functional-devstack-victoria-ansible-2.10 name: ansible-collections-openstack-functional-devstack-victoria-ansible-2.11
parent: ansible-collections-openstack-functional-devstack-ansible-devel parent: ansible-collections-openstack-functional-devstack-ansible-devel
description: | description: |
Run openstack collections functional tests against a victoria devstack Run openstack collections functional tests against a victoria devstack
using victoria brach of openstacksdk and stable 2.10 branch of ansible using victoria brach of openstacksdk and stable 2.11 branch of ansible
voting: true voting: true
override-checkout: stable/victoria override-checkout: stable/victoria
required-projects: required-projects:
- name: github.com/ansible/ansible - name: github.com/ansible/ansible
override-checkout: stable-2.10 override-checkout: stable-2.11
- name: openstack/openstacksdk - name: openstack/openstacksdk
override-checkout: stable/victoria override-checkout: stable/victoria
vars: vars:
@ -133,16 +133,16 @@
- job: - job:
name: ansible-collections-openstack-functional-devstack-ussuri-ansible-2.10 name: ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11
parent: ansible-collections-openstack-functional-devstack-ansible-devel parent: ansible-collections-openstack-functional-devstack-ansible-devel
description: | description: |
Run openstack collections functional tests against a ussuri devstack Run openstack collections functional tests against a ussuri devstack
using ussuri brach of openstacksdk and stable 2.10 branch of ansible using ussuri brach of openstacksdk and stable 2.11 branch of ansible
voting: true voting: true
override-checkout: stable/ussuri override-checkout: stable/ussuri
required-projects: required-projects:
- name: github.com/ansible/ansible - name: github.com/ansible/ansible
override-checkout: stable-2.10 override-checkout: stable-2.11
- name: openstack/openstacksdk - name: openstack/openstacksdk
override-checkout: stable/ussuri override-checkout: stable/ussuri
- name: openstack/os-client-config - name: openstack/os-client-config
@ -151,16 +151,16 @@
tox_envlist: ansible tox_envlist: ansible
- job: - job:
name: ansible-collections-openstack-functional-devstack-train-ansible-2.10 name: ansible-collections-openstack-functional-devstack-train-ansible-2.11
parent: ansible-collections-openstack-functional-devstack-ansible-devel parent: ansible-collections-openstack-functional-devstack-ansible-devel
description: | description: |
Run openstack collections functional tests against a train devstack Run openstack collections functional tests against a train devstack
using train brach of openstacksdk and stable 2.10 branch of ansible using train brach of openstacksdk and stable 2.11 branch of ansible
voting: false voting: false
override-checkout: stable/train override-checkout: stable/train
required-projects: required-projects:
- name: github.com/ansible/ansible - name: github.com/ansible/ansible
override-checkout: stable-2.10 override-checkout: stable-2.11
- name: openstack/openstacksdk - name: openstack/openstacksdk
override-checkout: stable/train override-checkout: stable/train
- name: openstack/os-client-config - name: openstack/os-client-config
@ -169,16 +169,16 @@
tox_envlist: ansible tox_envlist: ansible
- job: - job:
name: ansible-collections-openstack-functional-devstack-stein-ansible-2.10 name: ansible-collections-openstack-functional-devstack-stein-ansible-2.11
parent: ansible-collections-openstack-functional-devstack-ansible-devel parent: ansible-collections-openstack-functional-devstack-ansible-devel
description: | description: |
Run openstack collections functional tests against a stein devstack Run openstack collections functional tests against a stein devstack
using stein brach of openstacksdk and stable 2.10 branch of ansible using stein brach of openstacksdk and stable 2.11 branch of ansible
voting: true voting: true
override-checkout: stable/stein override-checkout: stable/stein
required-projects: required-projects:
- name: github.com/ansible/ansible - name: github.com/ansible/ansible
override-checkout: stable-2.10 override-checkout: stable-2.11
- name: openstack/openstacksdk - name: openstack/openstacksdk
override-checkout: stable/stein override-checkout: stable/stein
- name: openstack/os-client-config - name: openstack/os-client-config
@ -187,16 +187,16 @@
tox_envlist: ansible tox_envlist: ansible
- job: - job:
name: ansible-collections-openstack-functional-devstack-rocky-ansible-2.10 name: ansible-collections-openstack-functional-devstack-rocky-ansible-2.11
parent: ansible-collections-openstack-functional-devstack-ansible-devel parent: ansible-collections-openstack-functional-devstack-ansible-devel
description: | description: |
Run openstack collections functional tests against a rocky devstack Run openstack collections functional tests against a rocky devstack
using rocky brach of openstacksdk and stable 2.10 branch of ansible using rocky brach of openstacksdk and stable 2.11 branch of ansible
voting: true voting: true
override-checkout: stable/rocky override-checkout: stable/rocky
required-projects: required-projects:
- name: github.com/ansible/ansible - name: github.com/ansible/ansible
override-checkout: stable-2.10 override-checkout: stable-2.11
- name: openstack/openstacksdk - name: openstack/openstacksdk
override-checkout: stable/rocky override-checkout: stable/rocky
- name: openstack/os-client-config - name: openstack/os-client-config
@ -208,16 +208,16 @@
tox_envlist: ansible tox_envlist: ansible
- job: - job:
name: ansible-collections-openstack-functional-devstack-queens-ansible-2.10 name: ansible-collections-openstack-functional-devstack-queens-ansible-2.11
parent: ansible-collections-openstack-functional-devstack-ansible-devel parent: ansible-collections-openstack-functional-devstack-ansible-devel
description: | description: |
Run openstack collections functional tests against a queens devstack Run openstack collections functional tests against a queens devstack
using master branch of openstacksdk and stable 2.10 branch of ansible using master branch of openstacksdk and stable 2.11 branch of ansible
voting: true voting: true
override-checkout: stable/queens override-checkout: stable/queens
required-projects: required-projects:
- name: github.com/ansible/ansible - name: github.com/ansible/ansible
override-checkout: stable-2.10 override-checkout: stable-2.11
- name: openstack/openstacksdk - name: openstack/openstacksdk
# Run queens with highest possible py2 version of SDK # Run queens with highest possible py2 version of SDK
override-checkout: stable/train override-checkout: stable/train
@ -258,15 +258,15 @@
tox_envlist: linters-2.11 tox_envlist: linters-2.11
- job: - job:
name: openstack-tox-linters-ansible-2.10 name: openstack-tox-linters-ansible-2.11
parent: openstack-tox-linters parent: openstack-tox-linters
nodeset: ubuntu-bionic nodeset: ubuntu-bionic
description: | description: |
Run openstack collections linter tests using the 2.10 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.10 override-checkout: stable-2.11
- job: - job:
name: openstack-tox-linters-ansible-2.9 name: openstack-tox-linters-ansible-2.9
@ -299,13 +299,13 @@
jobs: jobs:
- tox-pep8 - tox-pep8
- openstack-tox-linters-ansible-devel - openstack-tox-linters-ansible-devel
- openstack-tox-linters-ansible-2.10 - 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:
dependencies: &deps_unit_lint dependencies: &deps_unit_lint
- tox-pep8 - tox-pep8
- openstack-tox-linters-ansible-2.9 - openstack-tox-linters-ansible-2.9
- openstack-tox-linters-ansible-2.10 - openstack-tox-linters-ansible-2.11
irrelevant-files: &ignore_files irrelevant-files: &ignore_files
- changelogs/.* - changelogs/.*
- COPYING - COPYING
@ -322,7 +322,7 @@
- ansible-collections-openstack-functional-devstack-ansible-2.9: - ansible-collections-openstack-functional-devstack-ansible-2.9:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
irrelevant-files: *ignore_files irrelevant-files: *ignore_files
- ansible-collections-openstack-functional-devstack-ansible-2.10: - ansible-collections-openstack-functional-devstack-ansible-2.11:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
irrelevant-files: *ignore_files irrelevant-files: *ignore_files
- ansible-collections-openstack-functional-devstack-ansible-devel: - ansible-collections-openstack-functional-devstack-ansible-devel:
@ -331,25 +331,25 @@
- ansible-collections-openstack-functional-devstack-ansible-pip: - ansible-collections-openstack-functional-devstack-ansible-pip:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
irrelevant-files: *ignore_files irrelevant-files: *ignore_files
- ansible-collections-openstack-functional-devstack-victoria-ansible-2.10: - ansible-collections-openstack-functional-devstack-victoria-ansible-2.11:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
irrelevant-files: *ignore_files irrelevant-files: *ignore_files
- ansible-collections-openstack-functional-devstack-ussuri-ansible-2.10: - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
irrelevant-files: *ignore_files irrelevant-files: *ignore_files
- ansible-collections-openstack-functional-devstack-train-ansible-2.10: - ansible-collections-openstack-functional-devstack-train-ansible-2.11:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
irrelevant-files: *ignore_files irrelevant-files: *ignore_files
voting: false voting: false
- ansible-collections-openstack-functional-devstack-stein-ansible-2.10: - ansible-collections-openstack-functional-devstack-stein-ansible-2.11:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
irrelevant-files: *ignore_files irrelevant-files: *ignore_files
voting: false voting: false
- ansible-collections-openstack-functional-devstack-rocky-ansible-2.10: - ansible-collections-openstack-functional-devstack-rocky-ansible-2.11:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
irrelevant-files: *ignore_files irrelevant-files: *ignore_files
voting: false voting: false
- ansible-collections-openstack-functional-devstack-queens-ansible-2.10: - ansible-collections-openstack-functional-devstack-queens-ansible-2.11:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
irrelevant-files: *ignore_files irrelevant-files: *ignore_files
voting: false voting: false
@ -369,38 +369,38 @@
gate: gate:
jobs: jobs:
- tox-pep8 - tox-pep8
- openstack-tox-linters-ansible-2.10 - 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
- ansible-collections-openstack-functional-devstack-ansible-2.9 - ansible-collections-openstack-functional-devstack-ansible-2.9
- ansible-collections-openstack-functional-devstack-ansible-2.10 - ansible-collections-openstack-functional-devstack-ansible-2.11
- ansible-collections-openstack-functional-devstack-ansible-pip - ansible-collections-openstack-functional-devstack-ansible-pip
- ansible-collections-openstack-functional-devstack-victoria-ansible-2.10 - ansible-collections-openstack-functional-devstack-victoria-ansible-2.11
- ansible-collections-openstack-functional-devstack-ussuri-ansible-2.10 - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11
# - ansible-collections-openstack-functional-devstack-train-ansible-2.10 # - ansible-collections-openstack-functional-devstack-train-ansible-2.11
# - ansible-collections-openstack-functional-devstack-stein-ansible-2.10 # - ansible-collections-openstack-functional-devstack-stein-ansible-2.11
# - ansible-collections-openstack-functional-devstack-rocky-ansible-2.10 # - ansible-collections-openstack-functional-devstack-rocky-ansible-2.11
# - ansible-collections-openstack-functional-devstack-queens-ansible-2.10 # - ansible-collections-openstack-functional-devstack-queens-ansible-2.11
- ansible-collections-openstack-functional-devstack-octavia - ansible-collections-openstack-functional-devstack-octavia
periodic: periodic:
jobs: jobs:
- openstack-tox-linters-ansible-devel - openstack-tox-linters-ansible-devel
- openstack-tox-linters-ansible-2.10 - 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
- ansible-collections-openstack-functional-devstack-ansible-2.9 - ansible-collections-openstack-functional-devstack-ansible-2.9
- ansible-collections-openstack-functional-devstack-ansible-2.10 - ansible-collections-openstack-functional-devstack-ansible-2.11
- ansible-collections-openstack-functional-devstack-ansible-devel - ansible-collections-openstack-functional-devstack-ansible-devel
- ansible-collections-openstack-functional-devstack-ansible-pip - ansible-collections-openstack-functional-devstack-ansible-pip
- ansible-collections-openstack-functional-devstack-victoria-ansible-2.10 - ansible-collections-openstack-functional-devstack-victoria-ansible-2.11
- ansible-collections-openstack-functional-devstack-ussuri-ansible-2.10 - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11
- ansible-collections-openstack-functional-devstack-train-ansible-2.10 - ansible-collections-openstack-functional-devstack-train-ansible-2.11
- ansible-collections-openstack-functional-devstack-stein-ansible-2.10 - ansible-collections-openstack-functional-devstack-stein-ansible-2.11
- ansible-collections-openstack-functional-devstack-rocky-ansible-2.10 - ansible-collections-openstack-functional-devstack-rocky-ansible-2.11
- ansible-collections-openstack-functional-devstack-queens-ansible-2.10 - ansible-collections-openstack-functional-devstack-queens-ansible-2.11
- ansible-collections-openstack-functional-devstack-queens-ansible-devel - ansible-collections-openstack-functional-devstack-queens-ansible-devel
- bifrost-collections-src - bifrost-collections-src
- bifrost-keystone-collections-src - bifrost-keystone-collections-src

11
test-requirements-2.10.txt
View File

@ -1,11 +0,0 @@
openstacksdk
ansible-base
pycodestyle
flake8
pylint
voluptuous
yamllint
rstcheck
ruamel.yaml
#galaxy-importer # see https://review.opendev.org/#/c/743054
tox

2
test-requirements.txt
View File

@ -1 +1 @@
test-requirements-2.10.txt test-requirements-2.11.txt

0
tests/sanity/ignore-2.10.txt → tests/sanity/ignore-2.12.txt
View File

2
tox.ini
View File

@ -35,7 +35,7 @@ commands =
deps = deps =
pbr pbr
ruamel.yaml ruamel.yaml
ansible-base ansible-core
commands = commands =
python {toxinidir}/tools/build.py python {toxinidir}/tools/build.py