Fix CI and add 2.16 Ansible job
Change-Id: Idcb5d2db4a92084239b80703be6a80de3e9f1116
This commit is contained in:
		
							
								
								
									
										33
									
								
								.zuul.yaml
									
									
									
									
									
								
							
							
						
						
									
										33
									
								
								.zuul.yaml
									
									
									
									
									
								
							| @@ -164,17 +164,17 @@ | ||||
|       tox_install_siblings: false | ||||
|  | ||||
| - job: | ||||
|     name: ansible-collections-openstack-functional-devstack-ansible-2.12 | ||||
|     name: ansible-collections-openstack-functional-devstack-ansible-2.16 | ||||
|     parent: ansible-collections-openstack-functional-devstack-base | ||||
|     branches: master | ||||
|     description: | | ||||
|       Run openstack collections functional tests against a master devstack | ||||
|       using master of openstacksdk and stable 2.12 branch of ansible | ||||
|       using master of openstacksdk and stable 2.16 branch of ansible | ||||
|     required-projects: | ||||
|       - name: github.com/ansible/ansible | ||||
|         override-checkout: stable-2.12 | ||||
|         override-checkout: stable-2.16 | ||||
|     vars: | ||||
|       tox_envlist: ansible_2_12 | ||||
|       tox_envlist: ansible_2_16 | ||||
|  | ||||
| - job: | ||||
|     name: ansible-collections-openstack-functional-devstack-ansible-devel | ||||
| @@ -218,19 +218,18 @@ | ||||
|       bindep_profile: test py310 | ||||
|  | ||||
| - job: | ||||
|     name: openstack-tox-linters-ansible-2.12 | ||||
|     name: openstack-tox-linters-ansible-2.16 | ||||
|     parent: openstack-tox-linters-ansible | ||||
|     nodeset: ubuntu-focal | ||||
|     description: | | ||||
|       Run openstack collections linter tests using the 2.12 branch of ansible | ||||
|       Run openstack collections linter tests using the 2.16 branch of ansible | ||||
|     required-projects: | ||||
|       - name: github.com/ansible/ansible | ||||
|         override-checkout: stable-2.12 | ||||
|         override-checkout: stable-2.16 | ||||
|     vars: | ||||
|       ensure_tox_version: '<4' | ||||
|       tox_envlist: linters_2_12 | ||||
|       python_version: 3.8 | ||||
|       bindep_profile: test py38 | ||||
|       # ensure_tox_version: '<4' | ||||
|       tox_envlist: linters_2_16 | ||||
|       python_version: "3.12" | ||||
|       bindep_profile: test py312 | ||||
|  | ||||
| # Cross-checks with other projects | ||||
| - job: | ||||
| @@ -284,10 +283,10 @@ | ||||
|       jobs: | ||||
|         - tox-pep8 | ||||
|         - openstack-tox-linters-ansible-devel | ||||
|         - openstack-tox-linters-ansible-2.12 | ||||
|         - openstack-tox-linters-ansible-2.16 | ||||
|         - ansible-collections-openstack-functional-devstack | ||||
|         - ansible-collections-openstack-functional-devstack-releases | ||||
|         - ansible-collections-openstack-functional-devstack-ansible-2.12 | ||||
|         - ansible-collections-openstack-functional-devstack-ansible-2.16 | ||||
|         - ansible-collections-openstack-functional-devstack-ansible-devel | ||||
|         - ansible-collections-openstack-functional-devstack-magnum | ||||
|         - ansible-collections-openstack-functional-devstack-octavia | ||||
| @@ -302,7 +301,7 @@ | ||||
|     gate: | ||||
|       jobs: | ||||
|         - tox-pep8 | ||||
|         - openstack-tox-linters-ansible-2.12 | ||||
|         - openstack-tox-linters-ansible-2.16 | ||||
|         # - ansible-collections-openstack-functional-devstack | ||||
|         - ansible-collections-openstack-functional-devstack-releases | ||||
|         # - ansible-collections-openstack-functional-devstack-ansible-2.12 | ||||
| @@ -312,10 +311,10 @@ | ||||
|     periodic: | ||||
|       jobs: | ||||
|         - openstack-tox-linters-ansible-devel | ||||
|         - openstack-tox-linters-ansible-2.12 | ||||
|         - openstack-tox-linters-ansible-2.16 | ||||
|         - ansible-collections-openstack-functional-devstack | ||||
|         - ansible-collections-openstack-functional-devstack-releases | ||||
|         - ansible-collections-openstack-functional-devstack-ansible-2.12 | ||||
|         - ansible-collections-openstack-functional-devstack-ansible-2.16 | ||||
|         - ansible-collections-openstack-functional-devstack-ansible-devel | ||||
|         - bifrost-collections-src | ||||
|         - bifrost-keystone-collections-src | ||||
|   | ||||
							
								
								
									
										2
									
								
								setup.py
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								setup.py
									
									
									
									
									
								
							| @@ -4,6 +4,6 @@ | ||||
| import setuptools | ||||
|  | ||||
| setuptools.setup( | ||||
|     setup_requires=['pbr'], | ||||
|     setup_requires=['pbr', 'setuptools'], | ||||
|     pbr=True, | ||||
|     py_modules=[]) | ||||
|   | ||||
							
								
								
									
										12
									
								
								tests/requirements-ansible-2.16.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								tests/requirements-ansible-2.16.txt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,12 @@ | ||||
| ansible-core>=2.16.0,<2.17.0 | ||||
| flake8 | ||||
| galaxy-importer | ||||
| openstacksdk | ||||
| pycodestyle | ||||
| pylint | ||||
| rstcheck | ||||
| ruamel.yaml | ||||
| tox | ||||
| voluptuous | ||||
| yamllint | ||||
| setuptools | ||||
							
								
								
									
										7
									
								
								tox.ini
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								tox.ini
									
									
									
									
									
								
							| @@ -36,13 +36,14 @@ deps = | ||||
|     galaxy-importer | ||||
|     pbr | ||||
|     ruamel.yaml | ||||
|     setuptools | ||||
| commands = | ||||
|     python {toxinidir}/tools/build.py | ||||
|     ansible --version | ||||
|     ansible-galaxy collection build --force {toxinidir} --output-path {toxinidir}/build_artifact | ||||
|     bash {toxinidir}/tools/check-import.sh {toxinidir} | ||||
|  | ||||
| [testenv:linters_{2_9,2_11,2_12,latest}] | ||||
| [testenv:linters_{2_9,2_11,2_12,2_16,latest}] | ||||
| allowlist_externals = bash | ||||
| commands = | ||||
|     {[testenv:build]commands} | ||||
| @@ -56,6 +57,7 @@ deps = | ||||
|     linters_2_9:    -r{toxinidir}/tests/requirements-ansible-2.9.txt | ||||
|     linters_2_11:   -r{toxinidir}/tests/requirements-ansible-2.11.txt | ||||
|     linters_2_12:   -r{toxinidir}/tests/requirements-ansible-2.12.txt | ||||
|     linters_2_16:   -r{toxinidir}/tests/requirements-ansible-2.16.txt | ||||
| passenv = * | ||||
|  | ||||
| [flake8] | ||||
| @@ -69,7 +71,7 @@ ignore = W503,H4,E501,E402,H301 | ||||
| show-source = True | ||||
| exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,ansible_collections | ||||
|  | ||||
| [testenv:ansible_{2_9,2_11,2_12,latest}] | ||||
| [testenv:ansible_{2_9,2_11,2_12,2_16,latest}] | ||||
| allowlist_externals = bash | ||||
| commands = | ||||
|     bash {toxinidir}/ci/run-ansible-tests-collection.sh -e {envdir} {posargs} | ||||
| @@ -79,6 +81,7 @@ deps = | ||||
|     ansible_2_9:    -r{toxinidir}/tests/requirements-ansible-2.9.txt | ||||
|     ansible_2_11:   -r{toxinidir}/tests/requirements-ansible-2.11.txt | ||||
|     ansible_2_12:   -r{toxinidir}/tests/requirements-ansible-2.12.txt | ||||
|     ansible_2_16:   -r{toxinidir}/tests/requirements-ansible-2.16.txt | ||||
| # Need to pass some env vars for the Ansible playbooks | ||||
| passenv = | ||||
|     HOME | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Sagi Shnaidman
					Sagi Shnaidman