Skip to content

Commit 6457baf

Browse files
robin-checkmkrobin-checkmk
authored
Merge pull request #862 from Checkmk/devel
Release 6.2.2
2 parents 3d6fd23 + a5cce61 commit 6457baf

File tree

93 files changed

+869
-701
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+869
-701
lines changed

‎.github/workflows/ans-int-test-activation.yaml‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ env:
1010
COLLECTION_NAME: general
1111
MODULE_NAME: activation
1212

13-
# https://stackoverflow.com/questions/70928424/limit-github-action-workflow-concurrency-on-push-and-pull-request
1413
concurrency:
1514
group: ${{ github.workflow }}-${{ github.ref }}
1615
cancel-in-progress: true
@@ -42,22 +41,18 @@ jobs:
4241
fail-fast: false
4342
matrix:
4443
ansible:
45-
- stable-2.16
4644
- stable-2.17
4745
- stable-2.18
46+
- stable-2.19
4847
- devel
4948
python:
50-
- '3.10'
5149
- '3.11'
5250
- '3.12'
5351
exclude:
5452
# Exclude unsupported sets.
55-
- ansible: stable-2.18
56-
python: '3.10'
57-
- ansible: devel
58-
python: '3.10'
5953
- ansible: devel
6054
python: '3.11'
55+
6156
services:
6257
ancient_cre:
6358
image: checkmk/check-mk-raw:2.2.0p45
@@ -67,28 +62,28 @@ jobs:
6762
CMK_SITE_ID: "ancient_cre"
6863
CMK_PASSWORD: "Sup3rSec4et!"
6964
old_cre:
70-
image: checkmk/check-mk-raw:2.3.0p35
65+
image: checkmk/check-mk-raw:2.3.0p36
7166
ports:
7267
- 5023:5000
7368
env:
7469
CMK_SITE_ID: "old_cre"
7570
CMK_PASSWORD: "Sup3rSec4et!"
7671
old_cme:
77-
image: checkmk/check-mk-managed:2.3.0p35
72+
image: checkmk/check-mk-managed:2.3.0p36
7873
ports:
7974
- 5323:5000
8075
env:
8176
CMK_SITE_ID: "old_cme"
8277
CMK_PASSWORD: "Sup3rSec4et!"
8378
stable_cre:
84-
image: checkmk/check-mk-raw:2.4.0p9
79+
image: checkmk/check-mk-raw:2.4.0p10
8580
ports:
8681
- 5024:5000
8782
env:
8883
CMK_SITE_ID: "stable_cre"
8984
CMK_PASSWORD: "Sup3rSec4et!"
9085
stable_cme:
91-
image: checkmk/check-mk-managed:2.4.0p9
86+
image: checkmk/check-mk-managed:2.4.0p10
9287
ports:
9388
- 5324:5000
9489
env:
@@ -101,14 +96,21 @@ jobs:
10196
with:
10297
path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
10398

104-
- name: Set up Python
105-
uses: actions/setup-python@v5
99+
- name: "Install uv and set the python version."
100+
uses: astral-sh/setup-uv@v6
106101
with:
107102
python-version: ${{ matrix.python }}
103+
enable-cache: true
104+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}/
105+
106+
- name: "Setup uv venv."
107+
run: uv venv
108+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
108109

109110
- name: Install ansible-base (${{ matrix.ansible }})
110-
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
111+
run: uv pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz
112+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
111113

112114
- name: Run integration test
113-
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --continue-on-error --diff --python ${{ matrix.python }}
115+
run: uv run ansible-test integration ${{env.MODULE_NAME}} -v --color --continue-on-error --diff --python ${{ matrix.python }}
114116
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}

‎.github/workflows/ans-int-test-bakery.yaml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,15 @@ jobs:
4141
fail-fast: false
4242
matrix:
4343
ansible:
44-
- stable-2.16
4544
- stable-2.17
4645
- stable-2.18
46+
- stable-2.19
4747
- devel
4848
python:
49-
- '3.10'
5049
- '3.11'
5150
- '3.12'
5251
exclude:
5352
# Exclude unsupported sets.
54-
- ansible: stable-2.18
55-
python: '3.10'
56-
- ansible: devel
57-
python: '3.10'
5853
- ansible: devel
5954
python: '3.11'
6055

@@ -67,21 +62,21 @@ jobs:
6762
CMK_SITE_ID: "ancient_cce"
6863
CMK_PASSWORD: "Sup3rSec4et!"
6964
old_cme:
70-
image: checkmk/check-mk-managed:2.3.0p35
65+
image: checkmk/check-mk-managed:2.3.0p36
7166
ports:
7267
- 5323:5000
7368
env:
7469
CMK_SITE_ID: "old_cme"
7570
CMK_PASSWORD: "Sup3rSec4et!"
7671
stable_cre:
77-
image: checkmk/check-mk-raw:2.4.0p9
72+
image: checkmk/check-mk-raw:2.4.0p10
7873
ports:
7974
- 5024:5000
8075
env:
8176
CMK_SITE_ID: "stable_cre"
8277
CMK_PASSWORD: "Sup3rSec4et!"
8378
stable_cme:
84-
image: checkmk/check-mk-managed:2.4.0p9
79+
image: checkmk/check-mk-managed:2.4.0p10
8580
ports:
8681
- 5324:5000
8782
env:
@@ -94,14 +89,21 @@ jobs:
9489
with:
9590
path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
9691

97-
- name: Set up Python
98-
uses: actions/setup-python@v5
92+
- name: "Install uv and set the python version."
93+
uses: astral-sh/setup-uv@v6
9994
with:
10095
python-version: ${{ matrix.python }}
96+
enable-cache: true
97+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}/
98+
99+
- name: "Setup uv venv."
100+
run: uv venv
101+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
101102

102103
- name: Install ansible-base (${{ matrix.ansible }})
103-
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
104+
run: uv pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz
105+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
104106

105107
- name: Run integration test
106-
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --continue-on-error --diff --python ${{ matrix.python }}
108+
run: uv run ansible-test integration ${{env.MODULE_NAME}} -v --color --continue-on-error --diff --python ${{ matrix.python }}
107109
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}

‎.github/workflows/ans-int-test-contact_group.yaml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,15 @@ jobs:
4141
fail-fast: false
4242
matrix:
4343
ansible:
44-
- stable-2.16
4544
- stable-2.17
4645
- stable-2.18
46+
- stable-2.19
4747
- devel
4848
python:
49-
- '3.10'
5049
- '3.11'
5150
- '3.12'
5251
exclude:
5352
# Exclude unsupported sets.
54-
- ansible: stable-2.18
55-
python: '3.10'
56-
- ansible: devel
57-
python: '3.10'
5853
- ansible: devel
5954
python: '3.11'
6055

@@ -67,28 +62,28 @@ jobs:
6762
CMK_SITE_ID: "ancient_cre"
6863
CMK_PASSWORD: "Sup3rSec4et!"
6964
old_cre:
70-
image: checkmk/check-mk-raw:2.3.0p35
65+
image: checkmk/check-mk-raw:2.3.0p36
7166
ports:
7267
- 5023:5000
7368
env:
7469
CMK_SITE_ID: "old_cre"
7570
CMK_PASSWORD: "Sup3rSec4et!"
7671
old_cme:
77-
image: checkmk/check-mk-managed:2.3.0p35
72+
image: checkmk/check-mk-managed:2.3.0p36
7873
ports:
7974
- 5323:5000
8075
env:
8176
CMK_SITE_ID: "old_cme"
8277
CMK_PASSWORD: "Sup3rSec4et!"
8378
stable_cre:
84-
image: checkmk/check-mk-raw:2.4.0p9
79+
image: checkmk/check-mk-raw:2.4.0p10
8580
ports:
8681
- 5024:5000
8782
env:
8883
CMK_SITE_ID: "stable_cre"
8984
CMK_PASSWORD: "Sup3rSec4et!"
9085
stable_cme:
91-
image: checkmk/check-mk-managed:2.4.0p9
86+
image: checkmk/check-mk-managed:2.4.0p10
9287
ports:
9388
- 5324:5000
9489
env:
@@ -101,14 +96,21 @@ jobs:
10196
with:
10297
path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
10398

104-
- name: Set up Python
105-
uses: actions/setup-python@v5
99+
- name: "Install uv and set the python version."
100+
uses: astral-sh/setup-uv@v6
106101
with:
107102
python-version: ${{ matrix.python }}
103+
enable-cache: true
104+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}/
105+
106+
- name: "Setup uv venv."
107+
run: uv venv
108+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
108109

109110
- name: Install ansible-base (${{ matrix.ansible }})
110-
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
111+
run: uv pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz
112+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
111113

112114
- name: Run integration test
113-
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --continue-on-error --diff --python ${{ matrix.python }}
115+
run: uv run ansible-test integration ${{env.MODULE_NAME}} -v --color --continue-on-error --diff --python ${{ matrix.python }}
114116
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}

‎.github/workflows/ans-int-test-discovery.yaml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,15 @@ jobs:
4141
fail-fast: false
4242
matrix:
4343
ansible:
44-
- stable-2.16
4544
- stable-2.17
4645
- stable-2.18
46+
- stable-2.19
4747
- devel
4848
python:
49-
- '3.10'
5049
- '3.11'
5150
- '3.12'
5251
exclude:
5352
# Exclude unsupported sets.
54-
- ansible: stable-2.18
55-
python: '3.10'
56-
- ansible: devel
57-
python: '3.10'
5853
- ansible: devel
5954
python: '3.11'
6055

@@ -67,28 +62,28 @@ jobs:
6762
CMK_SITE_ID: "ancient_cre"
6863
CMK_PASSWORD: "Sup3rSec4et!"
6964
old_cre:
70-
image: checkmk/check-mk-raw:2.3.0p35
65+
image: checkmk/check-mk-raw:2.3.0p36
7166
ports:
7267
- 5023:5000
7368
env:
7469
CMK_SITE_ID: "old_cre"
7570
CMK_PASSWORD: "Sup3rSec4et!"
7671
old_cme:
77-
image: checkmk/check-mk-managed:2.3.0p35
72+
image: checkmk/check-mk-managed:2.3.0p36
7873
ports:
7974
- 5323:5000
8075
env:
8176
CMK_SITE_ID: "old_cme"
8277
CMK_PASSWORD: "Sup3rSec4et!"
8378
stable_cre:
84-
image: checkmk/check-mk-raw:2.4.0p9
79+
image: checkmk/check-mk-raw:2.4.0p10
8580
ports:
8681
- 5024:5000
8782
env:
8883
CMK_SITE_ID: "stable_cre"
8984
CMK_PASSWORD: "Sup3rSec4et!"
9085
stable_cme:
91-
image: checkmk/check-mk-managed:2.4.0p9
86+
image: checkmk/check-mk-managed:2.4.0p10
9287
ports:
9388
- 5324:5000
9489
env:
@@ -101,14 +96,21 @@ jobs:
10196
with:
10297
path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
10398

104-
- name: Set up Python
105-
uses: actions/setup-python@v5
99+
- name: "Install uv and set the python version."
100+
uses: astral-sh/setup-uv@v6
106101
with:
107102
python-version: ${{ matrix.python }}
103+
enable-cache: true
104+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}/
105+
106+
- name: "Setup uv venv."
107+
run: uv venv
108+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
108109

109110
- name: Install ansible-base (${{ matrix.ansible }})
110-
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
111+
run: uv pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz
112+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
111113

112114
- name: Run integration test
113-
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --continue-on-error --diff --python ${{ matrix.python }}
115+
run: uv run ansible-test integration ${{env.MODULE_NAME}} -v --color --continue-on-error --diff --python ${{ matrix.python }}
114116
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}

0 commit comments

Comments
 (0)