Skip to content

Commit

Permalink
Merge branch 'devel' of github.com:Checkmk/ansible-collection-checkmk…
Browse files Browse the repository at this point in the history
….general into feature/agent-improve-idempotency
  • Loading branch information
robin-checkmk committed Jun 13, 2024
2 parents a6ac6df + a5c5d03 commit 341b325
Show file tree
Hide file tree
Showing 108 changed files with 1,339 additions and 610 deletions.
1 change: 1 addition & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ exclude_paths:
- .vagrant/
- changelogs/
- docs/

# parseable: true
# quiet: true
# verbosity: 1
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/ans-int-test-activation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ env:
COLLECTION_NAME: general
MODULE_NAME: activation

# https://stackoverflow.com/questions/70928424/limit-github-action-workflow-concurrency-on-push-and-pull-request
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

name: Ansible Integration Tests for Activation Module
on:
workflow_dispatch:
Expand Down Expand Up @@ -39,15 +44,14 @@ jobs:
- stable-2.17
- devel
python:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'
exclude:
# Exclude unsupported sets.
- ansible: stable-2.14
python: '3.12'
- ansible: devel
python: '3.9'
- ansible: stable-2.15
python: '3.12'

Expand All @@ -72,5 +76,5 @@ jobs:
CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}

- name: Run integration test
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker default
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
11 changes: 7 additions & 4 deletions .github/workflows/ans-int-test-bakery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ env:
COLLECTION_NAME: general
MODULE_NAME: bakery

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

name: Ansible Integration Tests for Bakery Module
on:
workflow_dispatch:
Expand Down Expand Up @@ -39,15 +43,14 @@ jobs:
- stable-2.17
- devel
python:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'
exclude:
# Exclude unsupported sets.
- ansible: stable-2.14
python: '3.12'
- ansible: devel
python: '3.9'
- ansible: stable-2.15
python: '3.12'

Expand All @@ -72,5 +75,5 @@ jobs:
CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}

- name: Run integration test
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker default
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
11 changes: 7 additions & 4 deletions .github/workflows/ans-int-test-contact_group.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ env:
COLLECTION_NAME: general
MODULE_NAME: contact_group

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

name: Ansible Integration Tests for Contact Group Module
on:
workflow_dispatch:
Expand Down Expand Up @@ -39,15 +43,14 @@ jobs:
- stable-2.17
- devel
python:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'
exclude:
# Exclude unsupported sets.
- ansible: stable-2.14
python: '3.12'
- ansible: devel
python: '3.9'
- ansible: stable-2.15
python: '3.12'

Expand All @@ -72,5 +75,5 @@ jobs:
CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}

- name: Run integration test
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker default
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
11 changes: 7 additions & 4 deletions .github/workflows/ans-int-test-discovery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ env:
COLLECTION_NAME: general
MODULE_NAME: discovery

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

name: Ansible Integration Tests for Discovery Module
on:
workflow_dispatch:
Expand Down Expand Up @@ -39,15 +43,14 @@ jobs:
- stable-2.17
- devel
python:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'
exclude:
# Exclude unsupported sets.
- ansible: stable-2.14
python: '3.12'
- ansible: devel
python: '3.9'
- ansible: stable-2.15
python: '3.12'

Expand All @@ -72,5 +75,5 @@ jobs:
CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}

- name: Run integration test
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker default
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
11 changes: 7 additions & 4 deletions .github/workflows/ans-int-test-downtime.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ env:
COLLECTION_NAME: general
MODULE_NAME: downtime

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

name: Ansible Integration Tests for Downtime Module
on:
workflow_dispatch:
Expand Down Expand Up @@ -39,15 +43,14 @@ jobs:
- stable-2.17
- devel
python:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'
exclude:
# Exclude unsupported sets.
- ansible: stable-2.14
python: '3.12'
- ansible: devel
python: '3.9'
- ansible: stable-2.15
python: '3.12'

Expand All @@ -72,5 +75,5 @@ jobs:
CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}

- name: Run integration test
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker default
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
11 changes: 7 additions & 4 deletions .github/workflows/ans-int-test-folder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ env:
COLLECTION_NAME: general
MODULE_NAME: folder

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

name: Ansible Integration Tests for Folder Module
on:
workflow_dispatch:
Expand Down Expand Up @@ -39,15 +43,14 @@ jobs:
- stable-2.17
- devel
python:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'
exclude:
# Exclude unsupported sets.
- ansible: stable-2.14
python: '3.12'
- ansible: devel
python: '3.9'
- ansible: stable-2.15
python: '3.12'

Expand All @@ -72,5 +75,5 @@ jobs:
CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}

- name: Run integration test
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker default
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
11 changes: 7 additions & 4 deletions .github/workflows/ans-int-test-host.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ env:
COLLECTION_NAME: general
MODULE_NAME: host

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

name: Ansible Integration Tests for Host Module
on:
workflow_dispatch:
Expand Down Expand Up @@ -39,15 +43,14 @@ jobs:
- stable-2.17
- devel
python:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'
exclude:
# Exclude unsupported sets.
- ansible: stable-2.14
python: '3.12'
- ansible: devel
python: '3.9'
- ansible: stable-2.15
python: '3.12'

Expand All @@ -72,5 +75,5 @@ jobs:
CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}

- name: Run integration test
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker default
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
11 changes: 7 additions & 4 deletions .github/workflows/ans-int-test-host_group.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ env:
COLLECTION_NAME: general
MODULE_NAME: host_group

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

name: Ansible Integration Tests for Host Group Module
on:
workflow_dispatch:
Expand Down Expand Up @@ -39,15 +43,14 @@ jobs:
- stable-2.17
- devel
python:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'
exclude:
# Exclude unsupported sets.
- ansible: stable-2.14
python: '3.12'
- ansible: devel
python: '3.9'
- ansible: stable-2.15
python: '3.12'

Expand All @@ -72,5 +75,5 @@ jobs:
CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}

- name: Run integration test
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker default
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
11 changes: 7 additions & 4 deletions .github/workflows/ans-int-test-lkp-bakery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ env:
COLLECTION_NAME: general
MODULE_NAME: lookup_bakery

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

name: Ansible Integration Tests for Bakery Lookup Module
on:
workflow_dispatch:
Expand Down Expand Up @@ -39,15 +43,14 @@ jobs:
- stable-2.17
- devel
python:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'
exclude:
# Exclude unsupported sets.
- ansible: stable-2.14
python: '3.12'
- ansible: devel
python: '3.9'
- ansible: stable-2.15
python: '3.12'

Expand All @@ -72,5 +75,5 @@ jobs:
CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}

- name: Run integration test
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker default
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
11 changes: 7 additions & 4 deletions .github/workflows/ans-int-test-lkp-folder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ env:
COLLECTION_NAME: general
MODULE_NAME: lookup_folder

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

name: Ansible Integration Tests for Folder Lookup Module
on:
workflow_dispatch:
Expand Down Expand Up @@ -37,15 +41,14 @@ jobs:
- stable-2.17
- devel
python:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'
exclude:
# Exclude unsupported sets.
- ansible: stable-2.14
python: '3.12'
- ansible: devel
python: '3.9'
- ansible: stable-2.15
python: '3.12'

Expand All @@ -70,5 +73,5 @@ jobs:
CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}

- name: Run integration test
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker default
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
Loading

0 comments on commit 341b325

Please sign in to comment.