diff --git a/.github/workflows/pull-request-management.yml b/.github/workflows/pull-request-management.yml index b950e3625..3eb75b30b 100644 --- a/.github/workflows/pull-request-management.yml +++ b/.github/workflows/pull-request-management.yml @@ -95,7 +95,7 @@ jobs: strategy: fail-fast: true matrix: - python_version: [3.9] + python_version: ['3.9','3.10','3.11'] steps: - name: 'set environment variables' run: | @@ -120,7 +120,7 @@ jobs: strategy: fail-fast: true matrix: - python_version: [3.9] + python_version: ['3.9','3.10','3.11'] steps: - name: 'set environment variables' run: | @@ -253,7 +253,7 @@ jobs: strategy: fail-fast: true matrix: - python_version: [3.9] + python_version: ['3.9'] steps: - name: 'set environment variables' run: | @@ -269,6 +269,4 @@ jobs: - name: 'ansible-test linting' run: | cd ansible_collections/arista/cvp/ - rm -rf molecule/ ansible-test sanity -v --requirements --docker --python ${{ matrix.python_version }} - rm -rf tests/output/ diff --git a/ansible_collections/arista/cvp/meta/runtime.yml b/ansible_collections/arista/cvp/meta/runtime.yml index a4727854a..12c32c099 100644 --- a/ansible_collections/arista/cvp/meta/runtime.yml +++ b/ansible_collections/arista/cvp/meta/runtime.yml @@ -1,5 +1,5 @@ --- -requires_ansible: '>=2.11.3' +requires_ansible: '>=2.14.0,<2.17.0' plugin_routing: modules: cv_facts: diff --git a/ansible_collections/arista/cvp/molecule/MOLECULE_SCENARIOS.txt b/ansible_collections/arista/cvp/molecule/MOLECULE_SCENARIOS.txt new file mode 100644 index 000000000..c97088add --- /dev/null +++ b/ansible_collections/arista/cvp/molecule/MOLECULE_SCENARIOS.txt @@ -0,0 +1,9 @@ +cv_change_control_v3 +cv_configlet_v3 +cv_device_v3 +cv_tag_v3 +cv_container_v3 +cv_facts_v3 +cv_task_v3 +cv_image_v3 +cv_validate_v3 diff --git a/ansible_collections/arista/cvp/molecule/Makefile b/ansible_collections/arista/cvp/molecule/Makefile index e1228489e..cbe07d36d 100644 --- a/ansible_collections/arista/cvp/molecule/Makefile +++ b/ansible_collections/arista/cvp/molecule/Makefile @@ -54,3 +54,14 @@ destroy: ## destroy all molecule scenarios cd ./molecule ; \ fi \ done + +.PHONY: test-molecule-v3 +test-molecule-v3:## Run V3 molecule scenarios + @while read -r MOLECULE_SCENARIO; do \ + if [ -d "$$MOLECULE_SCENARIO" ]; then\ + echo "Run scenario for "$$MOLECULE_SCENARIO && \ + cd .. ; \ + molecule converge --scenario-name $$MOLECULE_SCENARIO -- $(ANSIBLE_OPTIONS); \ + cd ./molecule ; \ + fi \ + done =2.12.6,<2.15.0,!=2.13.0 +ansible-core>=2.14.0,<2.17.0 ansible-builder ansible-lint>=6.13.0 galaxy-importer>=0.3.1 @@ -10,7 +10,7 @@ pre-commit>=2.9.2 pre-commit-hooks>=3.3.0 identify>=1.4.20 docker -molecule>=5.0.0 +molecule>=3.2.0,<6.0 molecule-docker>=0.2.4 mitogen pytest diff --git a/ansible_collections/arista/cvp/tests/sanity/ignore-2.11.txt b/ansible_collections/arista/cvp/tests/sanity/ignore-2.11.txt deleted file mode 100644 index 88e1ed8f2..000000000 --- a/ansible_collections/arista/cvp/tests/sanity/ignore-2.11.txt +++ /dev/null @@ -1,13 +0,0 @@ -plugins/modules/cv_change_control_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_configlet_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_configlet.py validate-modules:missing-gplv3-license -plugins/modules/cv_container_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_container.py validate-modules:missing-gplv3-license -plugins/modules/cv_device_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_device.py validate-modules:missing-gplv3-license -plugins/modules/cv_facts_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_facts.py validate-modules:missing-gplv3-license -plugins/modules/cv_image_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_tag_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_task_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_task.py validate-modules:missing-gplv3-license diff --git a/ansible_collections/arista/cvp/tests/sanity/ignore-2.13.txt b/ansible_collections/arista/cvp/tests/sanity/ignore-2.13.txt deleted file mode 100644 index 7d713bea8..000000000 --- a/ansible_collections/arista/cvp/tests/sanity/ignore-2.13.txt +++ /dev/null @@ -1,79 +0,0 @@ -plugins/modules/cv_change_control_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_configlet_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_configlet.py validate-modules:missing-gplv3-license -plugins/modules/cv_container_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_container.py validate-modules:missing-gplv3-license -plugins/modules/cv_device_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_device.py validate-modules:missing-gplv3-license -plugins/modules/cv_facts_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_facts.py validate-modules:missing-gplv3-license -plugins/modules/cv_image_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_tag_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_task_v3.py validate-modules:missing-gplv3-license -plugins/modules/cv_task.py validate-modules:missing-gplv3-license -plugins/module_utils/change_tools.py compile-2.7!skip -plugins/module_utils/change_tools.py import-2.7!skip -plugins/module_utils/configlet_tools.py compile-2.7!skip -plugins/module_utils/configlet_tools.py import-2.7!skip -plugins/module_utils/device_tools.py compile-2.7!skip -plugins/module_utils/device_tools.py import-2.7!skip -plugins/module_utils/container_tools.py compile-2.7!skip -plugins/module_utils/container_tools.py import-2.7!skip -plugins/module_utils/facts_tools.py compile-2.7!skip -plugins/module_utils/facts_tools.py import-2.7!skip -plugins/module_utils/generic_tools.py compile-2.7!skip -plugins/module_utils/generic_tools.py import-2.7!skip -plugins/module_utils/image_tools.py compile-2.7!skip -plugins/module_utils/image_tools.py import-2.7!skip -plugins/module_utils/resources/api/fields.py compile-2.7!skip -plugins/module_utils/resources/api/fields.py import-2.7!skip -plugins/module_utils/resources/exceptions.py compile-2.7!skip -plugins/module_utils/resources/exceptions.py import-2.7!skip -plugins/module_utils/resources/modules/fields.py compile-2.7!skip -plugins/module_utils/resources/modules/fields.py import-2.7!skip -plugins/module_utils/response.py compile-2.7!skip -plugins/module_utils/response.py import-2.7!skip -plugins/module_utils/tag_tools.py compile-2.7!skip -plugins/module_utils/tag_tools.py import-2.7!skip -plugins/module_utils/task_tools.py compile-2.7!skip -plugins/module_utils/task_tools.py import-2.7!skip -plugins/module_utils/tools_schema.py compile-2.7!skip -plugins/module_utils/tools_schema.py import-2.7!skip -plugins/modules/cv_configlet_v3.py compile-2.7!skip -plugins/modules/cv_configlet_v3.py import-2.7!skip -plugins/modules/cv_container_v3.py compile-2.7!skip -plugins/modules/cv_container_v3.py import-2.7!skip -plugins/modules/cv_device.py compile-2.7!skip -plugins/modules/cv_device.py import-2.7!skip -plugins/modules/cv_device_v3.py compile-2.7!skip -plugins/modules/cv_device_v3.py import-2.7!skip -plugins/modules/cv_facts_v3.py compile-2.7!skip -plugins/modules/cv_facts_v3.py import-2.7!skip -plugins/modules/cv_tag_v3.py compile-2.7!skip -plugins/modules/cv_tag_v3.py import-2.7!skip -plugins/modules/cv_task_v3.py compile-2.7!skip -plugins/modules/cv_task_v3.py import-2.7!skip -plugins/module_utils/device_tools.py compile-3.5!skip -plugins/module_utils/device_tools.py import-3.5!skip -plugins/module_utils/container_tools.py compile-3.5!skip -plugins/module_utils/container_tools.py import-3.5!skip -plugins/module_utils/resources/api/fields.py compile-3.5!skip -plugins/module_utils/resources/api/fields.py import-3.5!skip -plugins/module_utils/resources/exceptions.py compile-3.5!skip -plugins/module_utils/resources/exceptions.py import-3.5!skip -plugins/module_utils/resources/modules/fields.py compile-3.5!skip -plugins/module_utils/resources/modules/fields.py import-3.5!skip -plugins/module_utils/response.py compile-3.5!skip -plugins/module_utils/response.py import-3.5!skip -plugins/module_utils/tag_tools.py compile-3.5!skip -plugins/module_utils/tag_tools.py import-3.5!skip -plugins/module_utils/task_tools.py compile-3.5!skip -plugins/module_utils/task_tools.py import-3.5!skip -plugins/modules/cv_configlet_v3.py compile-3.5!skip -plugins/modules/cv_configlet_v3.py import-3.5!skip -plugins/modules/cv_container_v3.py compile-3.5!skip -plugins/modules/cv_container_v3.py import-3.5!skip -plugins/modules/cv_tag_v3.py compile-3.5!skip -plugins/modules/cv_tag_v3.py import-3.5!skip -plugins/modules/cv_task_v3.py compile-3.5!skip -plugins/modules/cv_task_v3.py import-3.5!skip diff --git a/ansible_collections/arista/cvp/tests/sanity/ignore-2.15.txt b/ansible_collections/arista/cvp/tests/sanity/ignore-2.15.txt index 7d713bea8..a7df66ed8 100644 --- a/ansible_collections/arista/cvp/tests/sanity/ignore-2.15.txt +++ b/ansible_collections/arista/cvp/tests/sanity/ignore-2.15.txt @@ -9,6 +9,7 @@ plugins/modules/cv_facts_v3.py validate-modules:missing-gplv3-license plugins/modules/cv_facts.py validate-modules:missing-gplv3-license plugins/modules/cv_image_v3.py validate-modules:missing-gplv3-license plugins/modules/cv_tag_v3.py validate-modules:missing-gplv3-license +plugins/modules/cv_validate_v3.py validate-modules:missing-gplv3-license plugins/modules/cv_task_v3.py validate-modules:missing-gplv3-license plugins/modules/cv_task.py validate-modules:missing-gplv3-license plugins/module_utils/change_tools.py compile-2.7!skip diff --git a/ansible_collections/arista/cvp/tests/sanity/ignore-2.12.txt b/ansible_collections/arista/cvp/tests/sanity/ignore-2.16.txt similarity index 98% rename from ansible_collections/arista/cvp/tests/sanity/ignore-2.12.txt rename to ansible_collections/arista/cvp/tests/sanity/ignore-2.16.txt index 7d713bea8..a7df66ed8 100644 --- a/ansible_collections/arista/cvp/tests/sanity/ignore-2.12.txt +++ b/ansible_collections/arista/cvp/tests/sanity/ignore-2.16.txt @@ -9,6 +9,7 @@ plugins/modules/cv_facts_v3.py validate-modules:missing-gplv3-license plugins/modules/cv_facts.py validate-modules:missing-gplv3-license plugins/modules/cv_image_v3.py validate-modules:missing-gplv3-license plugins/modules/cv_tag_v3.py validate-modules:missing-gplv3-license +plugins/modules/cv_validate_v3.py validate-modules:missing-gplv3-license plugins/modules/cv_task_v3.py validate-modules:missing-gplv3-license plugins/modules/cv_task.py validate-modules:missing-gplv3-license plugins/module_utils/change_tools.py compile-2.7!skip