Skip to content

Commit b3ebf93

Browse files
Fix molecule platforms
1 parent 3c22b0d commit b3ebf93

File tree

5 files changed

+25
-33
lines changed

5 files changed

+25
-33
lines changed

molecule/custom_env/molecule.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ driver:
1818
platforms:
1919
- name: "${os:-ubuntu20}-${tag:-latest}"
2020
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu20}:${tag:-latest}"
21-
command: /sbin/init
22-
tmpfs:
23-
- /run
24-
- /tmp
21+
command: ${MOLECULE_DOCKER_COMMAND:-""}
2522
volumes:
26-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
27-
privileged: yes
28-
pre_build_image: yes
23+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
24+
cgroupns_mode: host
25+
privileged: true
26+
pre_build_image: true
2927
verifier:
3028
name: ansible
3129
scenario:

molecule/default/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
- runner_user: ansible
99
- github_repo: ansible-github_actions_runner-testrepo
1010
- github_account: monolithprojects-testorg
11-
- runner_version: latest
11+
- runner_version: "latest"
1212
- runner_name: test_name
1313
- runner_on_ghes: yes
1414
- reinstall_runner: false

molecule/default/molecule.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ driver:
1818
platforms:
1919
- name: "${os:-ubuntu20}-${tag:-latest}"
2020
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu20}:${tag:-latest}"
21-
command: /sbin/init
22-
tmpfs:
23-
- /run
24-
- /tmp
21+
command: ${MOLECULE_DOCKER_COMMAND:-""}
2522
volumes:
26-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
27-
privileged: yes
28-
pre_build_image: yes
23+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
24+
cgroupns_mode: host
25+
privileged: true
26+
pre_build_image: true
2927
verifier:
3028
name: ansible
3129
scenario:

molecule/org/molecule.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@ lint: |
1313
driver:
1414
name: docker
1515
platforms:
16-
- name: "${os:-ubuntu16}-${tag:-latest}"
17-
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu16}:${tag:-latest}"
18-
command: /sbin/init
19-
tmpfs:
20-
- /run
21-
- /tmp
16+
- name: "${os:-ubuntu20}-${tag:-latest}"
17+
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu20}:${tag:-latest}"
18+
command: ${MOLECULE_DOCKER_COMMAND:-""}
2219
volumes:
23-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
24-
privileged: yes
25-
pre_build_image: yes
20+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
21+
cgroupns_mode: host
22+
privileged: true
23+
pre_build_image: true
2624
verifier:
2725
name: ansible
2826
scenario:

molecule/repo/molecule.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@ lint: |
1313
driver:
1414
name: docker
1515
platforms:
16-
- name: "${os:-ubuntu16}-${tag:-latest}"
17-
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu16}:${tag:-latest}"
18-
command: /sbin/init
19-
tmpfs:
20-
- /run
21-
- /tmp
16+
- name: "${os:-ubuntu20}-${tag:-latest}"
17+
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu20}:${tag:-latest}"
18+
command: ${MOLECULE_DOCKER_COMMAND:-""}
2219
volumes:
23-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
24-
privileged: yes
25-
pre_build_image: yes
20+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
21+
cgroupns_mode: host
22+
privileged: true
23+
pre_build_image: true
2624
verifier:
2725
name: ansible
2826
scenario:

0 commit comments

Comments
 (0)