Skip to content

Commit

Permalink
update CI matrix for modules with new ansible upstream stable branch (#…
Browse files Browse the repository at this point in the history
…808)

* update CI matrix for modules with new ansible upstream stable branch

* remove now unused python version from CI matrixes
  • Loading branch information
D3DeFi authored Sep 26, 2022
1 parent b8a6d73 commit 8fa08c2
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 48 deletions.
31 changes: 8 additions & 23 deletions .github/workflows/plugins-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: plugins-integration
on:
push:
paths:
- 'plugins/**'
- 'tests/integration/**'
- '.github/workflows/plugins-integration.yml'
- "plugins/**"
- "tests/integration/**"
- ".github/workflows/plugins-integration.yml"
pull_request:
paths:
- 'plugins/**'
- 'tests/integration/**'
- '.github/workflows/plugins-integration.yml'
- "plugins/**"
- "tests/integration/**"
- ".github/workflows/plugins-integration.yml"

jobs:
integration:
Expand All @@ -26,28 +26,13 @@ jobs:
- version: "6.0"
- version: "6.2"
ansible:
- stable-2.10
- stable-2.11
# https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-core-changelogs
- stable-2.12
- stable-2.13
- stable-2.14
- devel
python:
- 2.7 # required by Ansible see https://github.com/ansible-collections/overview/blob/main/collection_requirements.rst#python-compatibility
- 3.6 # required by Ansible see https://github.com/ansible-collections/overview/blob/main/collection_requirements.rst#python-compatibility
- 3.9
exclude:
- ansible: devel
python: 2.7
- ansible: devel
python: 3.6
- ansible: stable-2.12
python: 2.7
- ansible: stable-2.12
python: 3.6
- ansible: stable-2.13
python: 2.7
- ansible: stable-2.13
python: 3.6

steps:
- name: Check out code
Expand Down
28 changes: 3 additions & 25 deletions .github/workflows/repo-sanity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ jobs:
strategy:
matrix:
python:
- 2.7 # required by Ansible see https://github.com/ansible-collections/overview/blob/main/collection_requirements.rst#python-compatibility
- 3.6 # required by Ansible see https://github.com/ansible-collections/overview/blob/main/collection_requirements.rst#python-compatibility
- 3.9
runs-on: ubuntu-latest
steps:
Expand All @@ -28,11 +26,6 @@ jobs:
- name: Install dependencies
run: pip install flake8 tox

- name: Run lint test for py2
run: tox -elinters-py2 -vv
working-directory: ./ansible_collections/community/zabbix
if: matrix.python == '2.7'

- name: Run lint test for py3
run: tox -elinters-py3 -vv
working-directory: ./ansible_collections/community/zabbix
Expand All @@ -45,31 +38,16 @@ jobs:
ansible:
# It's important that Sanity is tested against all stable-X.Y branches
# Testing against `devel` may fail as new tests are added.
- stable-2.10
- stable-2.11

# https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-core-changelogs
- stable-2.12
- stable-2.13
- stable-2.14
- devel
python:
- 2.7 # required by Ansible see https://github.com/ansible-collections/overview/blob/main/collection_requirements.rst#python-compatibility
- 3.6 # required by Ansible see https://github.com/ansible-collections/overview/blob/main/collection_requirements.rst#python-compatibility
- 3.9
exclude:
- ansible: devel
python: 2.7
- ansible: devel
python: 3.6
- ansible: stable-2.12
python: 2.7
- ansible: stable-2.12
python: 3.6
- ansible: stable-2.13
python: 2.7
- ansible: stable-2.13
python: 3.6
runs-on: ubuntu-latest
steps:

# ansible-test requires the collection to be in a directory in the form
# .../ansible_collections/NAMESPACE/COLLECTION_NAME/

Expand Down
26 changes: 26 additions & 0 deletions tests/sanity/ignore-2.15.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
plugins/modules/zabbix_action.py validate-modules:doc-choices-do-not-match-spec
plugins/modules/zabbix_action.py validate-modules:doc-default-does-not-match-spec
plugins/modules/zabbix_action.py validate-modules:doc-elements-mismatch
plugins/modules/zabbix_action.py validate-modules:doc-required-mismatch
plugins/modules/zabbix_action.py validate-modules:invalid-argument-name
plugins/modules/zabbix_action.py validate-modules:missing-suboption-docs
plugins/modules/zabbix_action.py validate-modules:nonexistent-parameter-documented
plugins/modules/zabbix_action.py validate-modules:parameter-list-no-elements
plugins/modules/zabbix_action.py validate-modules:parameter-type-not-in-doc
plugins/modules/zabbix_action.py validate-modules:undocumented-parameter
plugins/modules/zabbix_group.py validate-modules:doc-elements-mismatch
plugins/modules/zabbix_group.py validate-modules:parameter-list-no-elements
plugins/modules/zabbix_group_info.py validate-modules:doc-elements-mismatch
plugins/modules/zabbix_group_info.py validate-modules:parameter-list-no-elements
plugins/modules/zabbix_host.py validate-modules:doc-elements-mismatch
plugins/modules/zabbix_host.py validate-modules:parameter-list-no-elements
plugins/modules/zabbix_host_info.py validate-modules:doc-elements-mismatch
plugins/modules/zabbix_host_info.py validate-modules:parameter-list-no-elements
plugins/modules/zabbix_maintenance.py validate-modules:doc-elements-mismatch
plugins/modules/zabbix_maintenance.py validate-modules:parameter-list-no-elements
plugins/modules/zabbix_mediatype.py validate-modules:doc-elements-mismatch
plugins/modules/zabbix_mediatype.py validate-modules:parameter-list-no-elements
plugins/modules/zabbix_template.py validate-modules:doc-elements-mismatch
plugins/modules/zabbix_template.py validate-modules:parameter-list-no-elements
plugins/modules/zabbix_user.py validate-modules:doc-elements-mismatch
plugins/modules/zabbix_user.py validate-modules:parameter-list-no-elements

0 comments on commit 8fa08c2

Please sign in to comment.