Skip to content

Commit 8576b8c

Browse files
tests: add molecule 5 support
1 parent 65b15a8 commit 8576b8c

File tree

4 files changed

+20
-22
lines changed

4 files changed

+20
-22
lines changed

molecule/custom_env/molecule.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,15 @@ provisioner:
1010
verify: verify.yml
1111
dependency:
1212
name: galaxy
13-
lint: |
14-
yamllint .
15-
ansible-lint .
1613
driver:
1714
name: docker
1815
platforms:
1916
- name: "${os:-ubuntu20}-${tag:-latest}"
2017
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu20}:${tag:-latest}"
21-
command: /sbin/init
2218
volumes:
23-
- "/sys/fs/cgroup:/sys/fs/cgroup:${MOLECULE_DOCKER_VOLUMES:-ro}" # Use "ro" for cgroup v1 and "rw" for cgroup v2
24-
cgroupns_mode: ${MOLECULE_DOCKER_CGROUPS_MODE:-"private"} # Use "private" for cgroup v1 and "host" for cgroup v2
19+
- "/sys/fs/cgroup:/sys/fs/cgroup:${MOLECULE_DOCKER_VOLUMES:-rw}" # Use "ro" for cgroup v1 and "rw" for cgroup v2
20+
cgroupns_mode: ${MOLECULE_DOCKER_CGROUPS_MODE:-"host"} # Use "private" for cgroup v1 and "host" for cgroup v2
21+
command: /usr/sbin/init
2522
privileged: true
2623
pre_build_image: true
2724
verifier:
@@ -30,12 +27,13 @@ scenario:
3027
name: custom_env
3128
test_sequence:
3229
- dependency
33-
- lint
3430
- destroy
3531
- syntax
3632
- create
33+
- prepare
3734
- converge
3835
- idempotence
36+
- side_effect
3937
- verify
4038
- cleanup
4139
- destroy

molecule/default/molecule.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,15 @@ provisioner:
1010
verify: verify.yml
1111
dependency:
1212
name: galaxy
13-
lint: |
14-
yamllint .
15-
ansible-lint .
1613
driver:
1714
name: docker
1815
platforms:
1916
- name: "${os:-ubuntu20}-${tag:-latest}"
2017
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu20}:${tag:-latest}"
21-
command: /sbin/init
2218
volumes:
23-
- "/sys/fs/cgroup:/sys/fs/cgroup:${MOLECULE_DOCKER_VOLUMES:-ro}" # Use "ro" for cgroup v1 and "rw" for cgroup v2
24-
cgroups_mode: ${MOLECULE_DOCKER_CGROUPS_MODE:-"private"} # Use "private" for cgroup v1 and "host" for cgroup v2
19+
- "/sys/fs/cgroup:/sys/fs/cgroup:${MOLECULE_DOCKER_VOLUMES:-rw}" # Use "ro" for cgroup v1 and "rw" for cgroup v2
20+
cgroupns_mode: ${MOLECULE_DOCKER_CGROUPS_MODE:-"host"} # Use "private" for cgroup v1 and "host" for cgroup v2
21+
command: /usr/sbin/init
2522
privileged: true
2623
pre_build_image: true
2724
verifier:
@@ -30,12 +27,13 @@ scenario:
3027
name: default
3128
test_sequence:
3229
- dependency
33-
- lint
3430
- destroy
3531
- syntax
3632
- create
33+
- prepare
3734
- converge
3835
- idempotence
36+
- side_effect
3937
- verify
4038
- cleanup
4139
- destroy

molecule/org/molecule.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ driver:
1515
platforms:
1616
- name: "${os:-ubuntu20}-${tag:-latest}"
1717
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu20}:${tag:-latest}"
18-
command: /sbin/init
1918
volumes:
20-
- "/sys/fs/cgroup:/sys/fs/cgroup:${MOLECULE_DOCKER_VOLUMES:-ro}" # Use "ro" for cgroup v1 and "rw" for cgroup v2
21-
cgroupns_mode: ${MOLECULE_DOCKER_CGROUPS_MODE:-"private"} # Use "private" for cgroup v1 and "host" for cgroup v2
19+
- "/sys/fs/cgroup:/sys/fs/cgroup:${MOLECULE_DOCKER_VOLUMES:-rw}" # Use "ro" for cgroup v1 and "rw" for cgroup v2
20+
cgroupns_mode: ${MOLECULE_DOCKER_CGROUPS_MODE:-"host"} # Use "private" for cgroup v1 and "host" for cgroup v2
21+
command: /usr/sbin/init
2222
privileged: true
2323
pre_build_image: true
2424
verifier:
@@ -27,12 +27,13 @@ scenario:
2727
name: org
2828
test_sequence:
2929
- dependency
30-
- lint
3130
- destroy
3231
- syntax
3332
- create
33+
- prepare
3434
- converge
3535
- idempotence
36+
- side_effect
3637
- verify
3738
- cleanup
3839
- destroy

molecule/repo/molecule.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ driver:
1515
platforms:
1616
- name: "${os:-ubuntu20}-${tag:-latest}"
1717
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu20}:${tag:-latest}"
18-
command: /sbin/init
1918
volumes:
20-
- "/sys/fs/cgroup:/sys/fs/cgroup:${MOLECULE_DOCKER_VOLUMES:-ro}" # Use "ro" for cgroup v1 and "rw" for cgroup v2
21-
cgroupns_mode: ${MOLECULE_DOCKER_CGROUPS_MODE:-"private"} # Use "private" for cgroup v1 and "host" for cgroup v2
19+
- "/sys/fs/cgroup:/sys/fs/cgroup:${MOLECULE_DOCKER_VOLUMES:-rw}" # Use "ro" for cgroup v1 and "rw" for cgroup v2
20+
cgroupns_mode: ${MOLECULE_DOCKER_CGROUPS_MODE:-"host"} # Use "private" for cgroup v1 and "host" for cgroup v2
21+
command: /usr/sbin/init
2222
privileged: true
2323
pre_build_image: true
2424
verifier:
@@ -27,12 +27,13 @@ scenario:
2727
name: repo
2828
test_sequence:
2929
- dependency
30-
- lint
3130
- destroy
3231
- syntax
3332
- create
33+
- prepare
3434
- converge
3535
- idempotence
36+
- side_effect
3637
- verify
3738
- cleanup
3839
- destroy

0 commit comments

Comments
 (0)