Skip to content

Commit

Permalink
Bump: Support additional ansible-core versions 2.13 and 2.14 (#2433)
Browse files Browse the repository at this point in the history
Co-authored-by: Claus Holbech <[email protected]>
Co-authored-by: Guillaume Mulocher <[email protected]>
  • Loading branch information
3 people authored Jan 20, 2023
1 parent fd87d6e commit a0a9d4e
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 11 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/pull-request-management.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
fail-fast: true
matrix:
avd_scenario: ['build_schemas_and_docs']
ansible_version: ['ansible-core>=2.11.3,<2.13.0']
ansible_version: ['ansible-core>=2.11.3,<2.15.0,!=2.12.0,!=2.12.1,!=2.12.2,!=2.12.3,!=2.12.4,!=2.12.5,!=2.13.0']
needs: [ pre_commit ]
if: needs.file-changes.outputs.docs == 'true'
steps:
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
- 'upgrade_eos_cli_config_gen'
- 'eos_cli_config_gen_v4.0'
ansible_version:
- 'ansible-core>=2.11.3,<2.13.0'
- 'ansible-core>=2.11.3,<2.15.0,!=2.12.0,!=2.12.1,!=2.12.2,!=2.12.3,!=2.12.4,!=2.12.5,!=2.13.0'
# Also test minimum ansible version for one scenario.
include:
- avd_scenario: 'eos_cli_config_gen'
Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:
fail-fast: true
matrix:
avd_scenario: ['dhcp_configuration', 'dhcp_provisioning']
ansible_version: ['ansible-core>=2.11.3,<2.13.0']
ansible_version: ['ansible-core>=2.11.3,<2.15.0,!=2.12.0,!=2.12.1,!=2.12.2,!=2.12.3,!=2.12.4,!=2.12.5,!=2.13.0']
needs: [ pre_commit ]
if: needs.file-changes.outputs.dhcp == 'true'
steps:
Expand Down Expand Up @@ -276,11 +276,15 @@ jobs:
- 'example-l2ls-fabric'
- 'example-single-dc-l3ls'
ansible_version:
- 'ansible-core>=2.11.3,<2.13.0'
# Also test minimum ansible version for one scenario.
- 'ansible-core>=2.11.3,<2.15.0,!=2.12.0,!=2.12.1,!=2.12.2,!=2.12.3,!=2.12.4,!=2.12.5,!=2.13.0'
# Also test with minimum and all other major versions
include:
- avd_scenario: 'eos_designs_unit_tests'
ansible_version: 'ansible-core==2.11.3'
- avd_scenario: 'eos_designs_unit_tests'
ansible_version: 'ansible-core>=2.12.6,<2.13.0'
- avd_scenario: 'eos_designs_unit_tests'
ansible_version: 'ansible-core>=2.13.1,<2.14.0'
needs: [ pre_commit ]
if: needs.file-changes.outputs.eos_design == 'true' || needs.file-changes.outputs.config_gen == 'true'
steps:
Expand Down Expand Up @@ -314,7 +318,7 @@ jobs:
fail-fast: true
matrix:
avd_scenario: ['eos_config_deploy_cvp']
ansible_version: ['ansible-core==2.11.3', 'ansible-core>=2.11.3,<2.13.0']
ansible_version: ['ansible-core==2.11.3', 'ansible-core>=2.12.6,<2.15.0,!=2.13.0']
needs: [ pre_commit ]
if: needs.file-changes.outputs.cloudvision == 'true'
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Installation workflow

- Install [Python](https://www.python.org/downloads/) **3.8** or later
- Install [ansible-core](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) from **2.11.3** to **2.12.x** excluding **2.12.0** to **2.12.5**
- Install [ansible-core](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) from **2.11.3** to **2.14.x** excluding **2.12.0** to **2.12.5** and **2.13.0**
!!! note
Excluded versions have an issue in `ansible-core`, which is [fixed](https://github.com/ansible/ansible/blob/v2.12.6/changelogs/CHANGELOG-v2.12.rst#bugfixes) in **2.12.6** and **2.13.1**. Plugin loader will now load config data for plugin by name instead of by file to avoid issues with the same file being loaded under different names (Fully-Qualified-Collection-Name + short-name).
- Install [arista.avd](#install-collection-from-ansible-galaxy) collection
Expand Down
2 changes: 1 addition & 1 deletion ansible_collections/arista/avd/meta/runtime.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
requires_ansible: '>=2.11.3,<2.13.0,!=2.12.0,!=2.12.1,!=2.12.2,!=2.12.3,!=2.12.4,!=2.12.5'
requires_ansible: '>=2.11.3,<2.15.0,!=2.12.0,!=2.12.1,!=2.12.2,!=2.12.3,!=2.12.4,!=2.12.5,!=2.13.0'
6 changes: 3 additions & 3 deletions ansible_collections/arista/avd/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ansible-core>=2.11.3,<2.13.0,!=2.12.0,!=2.12.1,!=2.12.2,!=2.12.3,!=2.12.4,!=2.12.5
ansible-lint<6.0.0
ansible-core>=2.11.3,<2.15.0,!=2.12.0,!=2.12.1,!=2.12.2,!=2.12.3,!=2.12.4,!=2.12.5,!=2.13.0
ansible-lint
galaxy-importer>=0.3.1
pycodestyle
flake8
Expand All @@ -9,7 +9,7 @@ pre-commit>=2.9.2
pre-commit-hooks>=3.3.0
identify>=1.4.20
docker
molecule>=3.2.0,<3.5.0
molecule>=3.2.0
molecule-docker>=0.2.4
yamllint
treelib
Expand Down
6 changes: 6 additions & 0 deletions ansible_collections/arista/avd/tests/sanity/ignore-2.13.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
plugins/modules/configlet_build_config.py validate-modules:missing-gplv3-license
plugins/modules/eos_designs_facts.py validate-modules:missing-gplv3-license
plugins/modules/inventory_to_container.py validate-modules:missing-gplv3-license
plugins/modules/validate_and_template.py validate-modules:missing-gplv3-license
plugins/modules/yaml_templates_to_facts.py validate-modules:missing-gplv3-license
roles/eos_designs/python_modules/custom_structured_configuration/avdstructuredconfig.py pep8:E203 # Required for compatibility with black formatting (space before colon)
6 changes: 6 additions & 0 deletions ansible_collections/arista/avd/tests/sanity/ignore-2.14.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
plugins/modules/configlet_build_config.py validate-modules:missing-gplv3-license
plugins/modules/eos_designs_facts.py validate-modules:missing-gplv3-license
plugins/modules/inventory_to_container.py validate-modules:missing-gplv3-license
plugins/modules/validate_and_template.py validate-modules:missing-gplv3-license
plugins/modules/yaml_templates_to_facts.py validate-modules:missing-gplv3-license
roles/eos_designs/python_modules/custom_structured_configuration/avdstructuredconfig.py pep8:E203 # Required for compatibility with black formatting (space before colon)

0 comments on commit a0a9d4e

Please sign in to comment.