Skip to content

Commit d6e9a82

Browse files
bodschbodsch
committedAug 20, 2024·
update workflows and molecule configs
·
1.1.1
1 parent e6df4bd commit d6e9a82

File tree

26 files changed

+271
-287
lines changed

26 files changed

+271
-287
lines changed
 

‎.github/workflows/icinga2.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ on:
2525
- "!README.md"
2626
- 'roles/icinga2/**'
2727
- '.github/workflows/icinga2.yml'
28-
- '.config/ansible-lint.yml'
29-
- '.yamllint'
28+
3029
pull_request:
3130
branches:
3231
- 'main'
@@ -38,8 +37,6 @@ on:
3837
- "!README.md"
3938
- 'roles/icinga2/**'
4039
- '.github/workflows/icinga2.yml'
41-
- '.config/ansible-lint.yml'
42-
- '.yamllint'
4340

4441
env:
4542
COLLECTION_NAMESPACE: bodsch

‎.github/workflows/icingadb.yml

+23-18
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ on:
2525
- "!README.md"
2626
- 'roles/icingadb/**'
2727
- '.github/workflows/icingadb.yml'
28-
- '.config/ansible-lint.yml'
29-
- '.yamllint'
28+
3029
pull_request:
3130
branches:
3231
- 'main'
@@ -38,8 +37,6 @@ on:
3837
- "!README.md"
3938
- 'roles/icingadb/**'
4039
- '.github/workflows/icingadb.yml'
41-
- '.config/ansible-lint.yml'
42-
- '.yamllint'
4340

4441
env:
4542
COLLECTION_NAMESPACE: bodsch
@@ -48,14 +45,14 @@ env:
4845
ANSIBLE_FORCE_COLOR: '1'
4946

5047
jobs:
51-
arch:
48+
debian:
5249
name: "${{ matrix.image }} / ${{ matrix.scenario }} / ${{ matrix.ansible-version }} / ${{ matrix.python_version }}"
5350
runs-on: ubuntu-22.04
5451
strategy:
5552
fail-fast: false
5653
matrix:
5754
image:
58-
- archlinux:latest
55+
- debian:12
5956
ansible-version:
6057
- '8.5'
6158
python_version:
@@ -69,8 +66,6 @@ jobs:
6966
steps:
7067
- name: check out the codebase.
7168
uses: actions/checkout@v4
72-
with:
73-
ref: ${{ github.event.workflow_run.head_branch }}
7469

7570
- name: 🐍 set up python
7671
uses: actions/setup-python@v5
@@ -82,6 +77,15 @@ jobs:
8277
python -m pip install --upgrade pip
8378
pip install -r test-requirements.txt
8479
80+
- name: force reinstall of community.docker
81+
run: |
82+
mkdir -p /home/runner/.ansible/collections
83+
ansible-galaxy collection install community.docker --force
84+
85+
- name: teardown apparmor
86+
run: |
87+
if [ -e /usr/sbin/aa-teardown ]; then /usr/sbin/aa-teardown; fi
88+
8589
- name: Install collection
8690
run: |
8791
make \
@@ -95,19 +99,15 @@ jobs:
9599
-e DISTRIBUTION="${{ matrix.image }}" \
96100
-e COLLECTION_ROLE="${{ matrix.collection_role }}" \
97101
-e COLLECTION_SCENARIO="${{ matrix.scenario }}"
98-
env:
99-
PY_COLORS: '1'
100-
ANSIBLE_FORCE_COLOR: '1'
101-
DISTRIBUTION: ${{ matrix.image }}
102102
103-
debian:
103+
ubuntu:
104104
name: "${{ matrix.image }} / ${{ matrix.scenario }} / ${{ matrix.ansible-version }} / ${{ matrix.python_version }}"
105105
runs-on: ubuntu-22.04
106106
strategy:
107107
fail-fast: false
108108
matrix:
109109
image:
110-
- debian:12
110+
- ubuntu:22.04
111111
ansible-version:
112112
- '8.5'
113113
python_version:
@@ -132,6 +132,15 @@ jobs:
132132
python -m pip install --upgrade pip
133133
pip install -r test-requirements.txt
134134
135+
- name: force reinstall of community.docker
136+
run: |
137+
mkdir -p /home/runner/.ansible/collections
138+
ansible-galaxy collection install community.docker --force
139+
140+
- name: teardown apparmor
141+
run: |
142+
if [ -e /usr/sbin/aa-teardown ]; then /usr/sbin/aa-teardown; fi
143+
135144
- name: Install collection
136145
run: |
137146
make \
@@ -145,7 +154,3 @@ jobs:
145154
-e DISTRIBUTION="${{ matrix.image }}" \
146155
-e COLLECTION_ROLE="${{ matrix.collection_role }}" \
147156
-e COLLECTION_SCENARIO="${{ matrix.scenario }}"
148-
env:
149-
PY_COLORS: '1'
150-
ANSIBLE_FORCE_COLOR: '1'
151-
DISTRIBUTION: ${{ matrix.image }}

‎.github/workflows/icingaweb2.yml

+82-17
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ on:
2525
- "!README.md"
2626
- 'roles/icingaweb2/**'
2727
- '.github/workflows/icingaweb2.yml'
28-
- '.config/ansible-lint.yml'
29-
- '.yamllint'
28+
3029
pull_request:
3130
branches:
3231
- 'main'
@@ -38,8 +37,6 @@ on:
3837
- "!README.md"
3938
- 'roles/icingaweb2/**'
4039
- '.github/workflows/icingaweb2.yml'
41-
- '.config/ansible-lint.yml'
42-
- '.yamllint'
4340

4441
env:
4542
COLLECTION_NAMESPACE: bodsch
@@ -48,14 +45,15 @@ env:
4845
ANSIBLE_FORCE_COLOR: '1'
4946

5047
jobs:
51-
arch:
48+
49+
debian:
5250
name: "${{ matrix.image }} / ${{ matrix.scenario }} / ${{ matrix.ansible-version }} / ${{ matrix.python_version }}"
5351
runs-on: ubuntu-22.04
5452
strategy:
5553
fail-fast: false
5654
matrix:
5755
image:
58-
- archlinux:latest
56+
- debian:12
5957
ansible-version:
6058
- '8.5'
6159
python_version:
@@ -69,8 +67,61 @@ jobs:
6967
steps:
7068
- name: check out the codebase.
7169
uses: actions/checkout@v4
70+
71+
- name: 🐍 set up python
72+
uses: actions/setup-python@v5
7273
with:
73-
ref: ${{ github.event.workflow_run.head_branch }}
74+
python-version: "${{ matrix.python_version }}"
75+
76+
- name: install dependencies
77+
run: |
78+
python -m pip install --upgrade pip
79+
pip install -r test-requirements.txt
80+
81+
- name: force reinstall of community.docker
82+
run: |
83+
mkdir -p /home/runner/.ansible/collections
84+
ansible-galaxy collection install community.docker --force
85+
86+
- name: teardown apparmor
87+
run: |
88+
if [ -e /usr/sbin/aa-teardown ]; then /usr/sbin/aa-teardown; fi
89+
90+
- name: Install collection
91+
run: |
92+
make \
93+
install
94+
95+
- name: test ${{ matrix.collection_role }} - ${{ matrix.scenario }}
96+
run: |
97+
make \
98+
test \
99+
-e TOX_ANSIBLE="ansible_${{ matrix.ansible-version }}" \
100+
-e DISTRIBUTION="${{ matrix.image }}" \
101+
-e COLLECTION_ROLE="${{ matrix.collection_role }}" \
102+
-e COLLECTION_SCENARIO="${{ matrix.scenario }}"
103+
104+
ubuntu:
105+
name: "${{ matrix.image }} / ${{ matrix.scenario }} / ${{ matrix.ansible-version }} / ${{ matrix.python_version }}"
106+
runs-on: ubuntu-22.04
107+
strategy:
108+
fail-fast: false
109+
matrix:
110+
image:
111+
- ubuntu:22.04
112+
ansible-version:
113+
- '8.5'
114+
python_version:
115+
- "3.10"
116+
- "3.11"
117+
scenario:
118+
- default
119+
collection_role:
120+
- icingaweb2
121+
122+
steps:
123+
- name: check out the codebase.
124+
uses: actions/checkout@v4
74125

75126
- name: 🐍 set up python
76127
uses: actions/setup-python@v5
@@ -82,6 +133,15 @@ jobs:
82133
python -m pip install --upgrade pip
83134
pip install -r test-requirements.txt
84135
136+
- name: force reinstall of community.docker
137+
run: |
138+
mkdir -p /home/runner/.ansible/collections
139+
ansible-galaxy collection install community.docker --force
140+
141+
- name: teardown apparmor
142+
run: |
143+
if [ -e /usr/sbin/aa-teardown ]; then /usr/sbin/aa-teardown; fi
144+
85145
- name: Install collection
86146
run: |
87147
make \
@@ -95,14 +155,12 @@ jobs:
95155
-e DISTRIBUTION="${{ matrix.image }}" \
96156
-e COLLECTION_ROLE="${{ matrix.collection_role }}" \
97157
-e COLLECTION_SCENARIO="${{ matrix.scenario }}"
98-
env:
99-
PY_COLORS: '1'
100-
ANSIBLE_FORCE_COLOR: '1'
101-
DISTRIBUTION: ${{ matrix.image }}
102158
103-
debian:
159+
scenarios:
104160
name: "${{ matrix.image }} / ${{ matrix.scenario }} / ${{ matrix.ansible-version }} / ${{ matrix.python_version }}"
105161
runs-on: ubuntu-22.04
162+
needs:
163+
- debian
106164
strategy:
107165
fail-fast: false
108166
matrix:
@@ -114,7 +172,9 @@ jobs:
114172
- "3.10"
115173
- "3.11"
116174
scenario:
117-
- default
175+
- with-update
176+
- with-icingadb
177+
- update_2.7.0-2.11.3
118178
collection_role:
119179
- icingaweb2
120180

@@ -132,6 +192,15 @@ jobs:
132192
python -m pip install --upgrade pip
133193
pip install -r test-requirements.txt
134194
195+
- name: force reinstall of community.docker
196+
run: |
197+
mkdir -p /home/runner/.ansible/collections
198+
ansible-galaxy collection install community.docker --force
199+
200+
- name: teardown apparmor
201+
run: |
202+
if [ -e /usr/sbin/aa-teardown ]; then /usr/sbin/aa-teardown; fi
203+
135204
- name: Install collection
136205
run: |
137206
make \
@@ -145,7 +214,3 @@ jobs:
145214
-e DISTRIBUTION="${{ matrix.image }}" \
146215
-e COLLECTION_ROLE="${{ matrix.collection_role }}" \
147216
-e COLLECTION_SCENARIO="${{ matrix.scenario }}"
148-
env:
149-
PY_COLORS: '1'
150-
ANSIBLE_FORCE_COLOR: '1'
151-
DISTRIBUTION: ${{ matrix.image }}

‎.github/workflows/icingaweb2_modules.yml

+1-60
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ on:
2525
- "!README.md"
2626
- 'roles/icingaweb2_modules/**'
2727
- '.github/workflows/icingaweb2_modules.yml'
28-
- '.config/ansible-lint.yml'
29-
- '.yamllint'
28+
3029
pull_request:
3130
branches:
3231
- 'main'
@@ -38,8 +37,6 @@ on:
3837
- "!README.md"
3938
- 'roles/icingaweb2_modules/**'
4039
- '.github/workflows/icingaweb2_modules.yml'
41-
- '.config/ansible-lint.yml'
42-
- '.yamllint'
4340

4441
env:
4542
COLLECTION_NAMESPACE: bodsch
@@ -48,58 +45,6 @@ env:
4845
ANSIBLE_FORCE_COLOR: '1'
4946

5047
jobs:
51-
arch:
52-
name: "${{ matrix.image }} / ${{ matrix.scenario }} / ${{ matrix.ansible-version }} / ${{ matrix.python_version }}"
53-
runs-on: ubuntu-22.04
54-
strategy:
55-
fail-fast: false
56-
matrix:
57-
image:
58-
- archlinux:latest
59-
ansible-version:
60-
- '8.5'
61-
python_version:
62-
- "3.10"
63-
- "3.11"
64-
scenario:
65-
- default
66-
collection_role:
67-
- icingaweb2_modules
68-
69-
steps:
70-
- name: check out the codebase.
71-
uses: actions/checkout@v4
72-
with:
73-
ref: ${{ github.event.workflow_run.head_branch }}
74-
75-
- name: 🐍 set up python
76-
uses: actions/setup-python@v5
77-
with:
78-
python-version: "${{ matrix.python_version }}"
79-
80-
- name: install dependencies
81-
run: |
82-
python -m pip install --upgrade pip
83-
pip install -r test-requirements.txt
84-
85-
- name: Install collection
86-
run: |
87-
make \
88-
install
89-
90-
- name: test ${{ matrix.collection_role }} - ${{ matrix.scenario }}
91-
run: |
92-
make \
93-
test \
94-
-e TOX_ANSIBLE="ansible_${{ matrix.ansible-version }}" \
95-
-e DISTRIBUTION="${{ matrix.image }}" \
96-
-e COLLECTION_ROLE="${{ matrix.collection_role }}" \
97-
-e COLLECTION_SCENARIO="${{ matrix.scenario }}"
98-
env:
99-
PY_COLORS: '1'
100-
ANSIBLE_FORCE_COLOR: '1'
101-
DISTRIBUTION: ${{ matrix.image }}
102-
10348
debian:
10449
name: "${{ matrix.image }} / ${{ matrix.scenario }} / ${{ matrix.ansible-version }} / ${{ matrix.python_version }}"
10550
runs-on: ubuntu-22.04
@@ -145,7 +90,3 @@ jobs:
14590
-e DISTRIBUTION="${{ matrix.image }}" \
14691
-e COLLECTION_ROLE="${{ matrix.collection_role }}" \
14792
-e COLLECTION_SCENARIO="${{ matrix.scenario }}"
148-
env:
149-
PY_COLORS: '1'
150-
ANSIBLE_FORCE_COLOR: '1'
151-
DISTRIBUTION: ${{ matrix.image }}

0 commit comments

Comments
 (0)
Please sign in to comment.