openstack/ansible-collections-openstack
Code Issues Proposed changes

Move CI to use Ansible 2.12 version as main

Browse Source 
Move only from victoria, since Ansible 2.12 is installed with
py > 3.8.
Remove ussuri from voting jobs, use it for experimental only.
Change-Id: I74b7272794ea5fbafb7d81a5cf0068c09130bb0d
This commit is contained in:
Sagi Shnaidman 2021-10-04 12:26:19 +03:00
parent 011515de2d
commit 980536c32e
4 changed files with 64 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
.zuul.yaml
View File

@ -41,7 +41,7 @@
required-projects: required-projects:
- openstack/octavia - openstack/octavia
- name: github.com/ansible/ansible - name: github.com/ansible/ansible
override-checkout: stable-2.11 override-checkout: stable-2.12
files: files:
- ^ci/roles/loadbalancer/.*$ - ^ci/roles/loadbalancer/.*$
- ^plugins/modules/lb_health_monitor.py - ^plugins/modules/lb_health_monitor.py
@ -95,13 +95,25 @@
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.11 branch of ansible using master of openstacksdk and stable 2.12 branch of ansible
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: vars:
tox_envlist: ansible tox_envlist: ansible
- job:
name: ansible-collections-openstack-functional-devstack-ansible-2.12
parent: ansible-collections-openstack-functional-devstack
description: |
Run openstack collections functional tests against a master devstack
using master of openstacksdk and stable 2.12 branch of ansible
required-projects:
- name: github.com/ansible/ansible
override-checkout: stable-2.12
vars:
tox_envlist: ansible
- job: - job:
name: ansible-collections-openstack-functional-devstack-ansible-devel name: ansible-collections-openstack-functional-devstack-ansible-devel
parent: ansible-collections-openstack-functional-devstack parent: ansible-collections-openstack-functional-devstack
@ -113,36 +125,36 @@
- name: github.com/ansible/ansible - name: github.com/ansible/ansible
override-checkout: devel override-checkout: devel
vars: vars:
tox_envlist: ansible-2.11 tox_envlist: ansible-2.12
# Stable branches tests # Stable branches tests
- job: - job:
name: ansible-collections-openstack-functional-devstack-wallaby-ansible-2.11 name: ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12
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 wallaby devstack Run openstack collections functional tests against a wallaby devstack
using wallaby brach of openstacksdk and stable 2.11 branch of ansible using wallaby brach of openstacksdk and stable 2.12 branch of ansible
voting: true voting: true
override-checkout: stable/wallaby override-checkout: stable/wallaby
required-projects: required-projects:
- name: github.com/ansible/ansible - name: github.com/ansible/ansible
override-checkout: stable-2.11 override-checkout: stable-2.12
- name: openstack/openstacksdk - name: openstack/openstacksdk
override-checkout: stable/wallaby override-checkout: stable/wallaby
vars: vars:
tox_envlist: ansible tox_envlist: ansible
- job: - job:
name: ansible-collections-openstack-functional-devstack-victoria-ansible-2.11 name: ansible-collections-openstack-functional-devstack-victoria-ansible-2.12
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.11 branch of ansible using victoria brach of openstacksdk and stable 2.12 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.11 override-checkout: stable-2.12
- name: openstack/openstacksdk - name: openstack/openstacksdk
override-checkout: stable/victoria override-checkout: stable/victoria
vars: vars:
@ -271,22 +283,22 @@
- name: github.com/ansible/ansible - name: github.com/ansible/ansible
override-checkout: devel override-checkout: devel
vars: vars:
tox_envlist: linters-2.11 tox_envlist: linters-2.12
python_version: 3.8 python_version: 3.8
bindep_profile: test py38 bindep_profile: test py38
- job: - job:
name: openstack-tox-linters-ansible-2.11 name: openstack-tox-linters-ansible-2.12
parent: openstack-tox-linters parent: openstack-tox-linters
nodeset: ubuntu-focal 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.12 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.12
vars: vars:
tox_envlist: linters-2.11 tox_envlist: linters-2.12
python_version: 3.8 python_version: 3.8
bindep_profile: test py38 bindep_profile: test py38
@ -373,27 +385,25 @@
jobs: jobs:
- tox-pep8 - tox-pep8
- openstack-tox-linters-ansible-devel - openstack-tox-linters-ansible-devel
- openstack-tox-linters-ansible-2.11 - openstack-tox-linters-ansible-2.12
- 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.11 - openstack-tox-linters-ansible-2.12
- ansible-collections-openstack-functional-devstack-releases: - ansible-collections-openstack-functional-devstack-releases:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
- ansible-collections-openstack-functional-devstack-ansible-2.9: - ansible-collections-openstack-functional-devstack-ansible-2.9:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
- ansible-collections-openstack-functional-devstack-ansible-2.11: - ansible-collections-openstack-functional-devstack-ansible-2.12:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
- ansible-collections-openstack-functional-devstack-ansible-devel: - ansible-collections-openstack-functional-devstack-ansible-devel:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
- ansible-collections-openstack-functional-devstack-wallaby-ansible-2.11: - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
- ansible-collections-openstack-functional-devstack-victoria-ansible-2.11: - ansible-collections-openstack-functional-devstack-victoria-ansible-2.12:
dependencies: *deps_unit_lint
- ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
- ansible-collections-openstack-functional-devstack-train-ansible-2.11: - ansible-collections-openstack-functional-devstack-train-ansible-2.11:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
@ -422,15 +432,14 @@
gate: gate:
jobs: jobs:
- tox-pep8 - tox-pep8
- openstack-tox-linters-ansible-2.11 - openstack-tox-linters-ansible-2.12
- 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.11 - ansible-collections-openstack-functional-devstack-ansible-2.12
- ansible-collections-openstack-functional-devstack-wallaby-ansible-2.11 - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12
- ansible-collections-openstack-functional-devstack-victoria-ansible-2.11 - ansible-collections-openstack-functional-devstack-victoria-ansible-2.12
- 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
@ -439,16 +448,15 @@
periodic: periodic:
jobs: jobs:
- openstack-tox-linters-ansible-devel - openstack-tox-linters-ansible-devel
- openstack-tox-linters-ansible-2.11 - openstack-tox-linters-ansible-2.12
- 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.11 - ansible-collections-openstack-functional-devstack-ansible-2.12
- ansible-collections-openstack-functional-devstack-ansible-devel - ansible-collections-openstack-functional-devstack-ansible-devel
- ansible-collections-openstack-functional-devstack-wallaby-ansible-2.11 - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12
- ansible-collections-openstack-functional-devstack-victoria-ansible-2.11 - ansible-collections-openstack-functional-devstack-victoria-ansible-2.12
- 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-queens-ansible-devel - ansible-collections-openstack-functional-devstack-queens-ansible-devel
@ -458,6 +466,8 @@
experimental: experimental:
jobs: jobs:
- ansible-collections-openstack-functional-devstack-ansible-2.11
- ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11
- ansible-collections-openstack-functional-devstack-stein-ansible-2.11 - ansible-collections-openstack-functional-devstack-stein-ansible-2.11
- ansible-collections-openstack-functional-devstack-rocky-ansible-2.11 - ansible-collections-openstack-functional-devstack-rocky-ansible-2.11
- ansible-collections-openstack-functional-devstack-queens-ansible-devel - ansible-collections-openstack-functional-devstack-queens-ansible-devel

11
test-requirements-2.12.txt Normal file
View File

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

0
tests/sanity/ignore-2.13.txt Normal file
View File

12
tox.ini
View File

@ -65,6 +65,12 @@ commands = {[testenv:linters]commands}
deps = deps =
-r{toxinidir}/test-requirements-2.11.txt -r{toxinidir}/test-requirements-2.11.txt
[testenv:linters-2.12]
passenv = {[testenv:linters]passenv}
commands = {[testenv:linters]commands}
deps =
-r{toxinidir}/test-requirements-2.12.txt
[testenv:venv] [testenv:venv]
deps = deps =
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
@ -112,6 +118,12 @@ deps =
passenv = {[testenv:ansible]passenv} passenv = {[testenv:ansible]passenv}
commands = {[testenv:ansible]commands} commands = {[testenv:ansible]commands}
[testenv:ansible-2.12]
deps =
-r{toxinidir}/test-requirements-2.12.txt
passenv = {[testenv:ansible]passenv}
commands = {[testenv:ansible]commands}
[testenv:galaxy-release] [testenv:galaxy-release]
deps = deps =
ansible-core ansible-core