Skip to content

Commit 180fc7c

Browse files
authored
Merge pull request #745 from manala/all/cleanup-molecule-scenarios-hosts
[All] Cleanup molecule scenarios hosts
2 parents 39569d9 + 223c72d commit 180fc7c

File tree

4 files changed

+33
-11
lines changed

4 files changed

+33
-11
lines changed

extensions/molecule/mysql.8.4/converge.yml

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
- name: Default
88
tags: [default]
99
hosts:
10-
- debian.trixie
10+
- debian
11+
- "!debian.bullseye"
12+
- "!debian.bookworm"
1113
tasks:
1214
- block: # noqa: name[missing]
1315
- name: Role
@@ -43,7 +45,9 @@
4345
- name: Client
4446
tags: [client]
4547
hosts:
46-
- debian.trixie
48+
- debian
49+
- "!debian.bullseye"
50+
- "!debian.bookworm"
4751
tasks:
4852
- name: Packages absent
4953
ansible.builtin.apt:
@@ -71,7 +75,9 @@
7175
- name: Config
7276
tags: [config]
7377
hosts:
74-
- debian.trixie
78+
- debian
79+
- "!debian.bullseye"
80+
- "!debian.bookworm"
7581
vars:
7682
tests_dir: /molecule/mysql/config
7783
tasks:
@@ -123,7 +129,9 @@
123129
- name: Configs
124130
tags: [configs]
125131
hosts:
126-
- debian.trixie
132+
- debian
133+
- "!debian.bullseye"
134+
- "!debian.bookworm"
127135
vars:
128136
tests_dir: /molecule/mysql/configs
129137
tasks:
@@ -223,7 +231,9 @@
223231
- name: Data
224232
tags: [data]
225233
hosts:
226-
- debian.trixie
234+
- debian
235+
- "!debian.bullseye"
236+
- "!debian.bookworm"
227237
vars:
228238
tests_dir: /molecule/mysql/data
229239
tasks:
@@ -263,7 +273,9 @@
263273
- name: Users
264274
tags: [users]
265275
hosts:
266-
- debian.trixie
276+
- debian
277+
- "!debian.bullseye"
278+
- "!debian.bookworm"
267279
tasks:
268280
- name: Role - Default
269281
ansible.builtin.import_role:
@@ -351,7 +363,9 @@
351363
- name: Databases
352364
tags: [databases]
353365
hosts:
354-
- debian.trixie
366+
- debian
367+
- "!debian.bullseye"
368+
- "!debian.bookworm"
355369
tasks:
356370
- name: Role - Default
357371
ansible.builtin.import_role:

extensions/molecule/mysql.8.4/prepare.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
- name: Prepare
44
tags: [always]
55
hosts:
6-
- debian.trixie
6+
- debian
7+
- "!debian.bullseye"
8+
- "!debian.bookworm"
79
tasks:
810
- name: Apt
911
ansible.builtin.import_role:

extensions/molecule/redis.8.0/converge.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
- name: Default
88
tags: [default]
99
hosts:
10-
- debian.trixie
10+
- debian
11+
- "!debian.bullseye"
12+
- "!debian.bookworm"
1113
tasks:
1214
- block: # noqa: name[missing]
1315
- name: Role
@@ -30,7 +32,9 @@
3032
- name: Config
3133
tags: [config]
3234
hosts:
33-
- debian.trixie
35+
- debian
36+
- "!debian.bullseye"
37+
- "!debian.bookworm"
3438
vars:
3539
tests_dir: /molecule/redis/config
3640
tasks:

extensions/molecule/redis.8.0/prepare.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
- name: Prepare
44
tags: [always]
55
hosts:
6-
- debian.trixie
6+
- debian
7+
- "!debian.bullseye"
8+
- "!debian.bookworm"
79
tasks:
810
- name: Apt
911
ansible.builtin.import_role:

0 commit comments

Comments
 (0)