Skip to content

Commit 40d2169

Browse files
jsf9kmcdonnnj
authored andcommitted
Make the configuration clearer by explicitly specifying the amd64 platform
This will ensure that local Molecule testing continues to function as expected for folks using Macs with new (arm64) hardware.
1 parent 6b06b7c commit 40d2169

File tree

2 files changed

+48
-24
lines changed

2 files changed

+48
-24
lines changed

molecule/default/molecule-no-systemd.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,43 @@ lint: |
1616
ansible-lint
1717
flake8
1818
platforms:
19-
- name: amazonlinux2
19+
- name: amazonlinux2-amd64
2020
image: amazonlinux:2
21-
- name: debian9
21+
platform: amd64
22+
- name: debian9-amd64
2223
image: debian:stretch-slim
2324
dockerfile: Dockerfile_debian_9.j2
24-
- name: debian10
25+
platform: amd64
26+
- name: debian10-amd64
2527
image: debian:buster-slim
26-
- name: debian11
28+
platform: amd64
29+
- name: debian11-amd64
2730
image: debian:bullseye-slim
28-
- name: debian12
31+
platform: amd64
32+
- name: debian12-amd64
2933
image: debian:bookworm-slim
30-
- name: kali
34+
platform: amd64
35+
- name: kali-amd64
3136
image: kalilinux/kali-rolling
32-
- name: fedora35
37+
platform: amd64
38+
- name: fedora35-amd64
3339
image: fedora:35
34-
- name: fedora36
40+
platform: amd64
41+
- name: fedora36-amd64
3542
image: fedora:36
36-
- name: fedora37
43+
platform: amd64
44+
- name: fedora37-amd64
3745
image: fedora:37
38-
- name: ubuntu18
46+
platform: amd64
47+
- name: ubuntu18-amd64
3948
image: ubuntu:bionic
40-
- name: ubuntu20
49+
platform: amd64
50+
- name: ubuntu20-amd64
4151
image: ubuntu:focal
42-
- name: ubuntu22
52+
platform: amd64
53+
- name: ubuntu22-amd64
4354
image: ubuntu:jammy
55+
platform: amd64
4456
provisioner:
4557
name: ansible
4658
inventory:

molecule/default/molecule-with-systemd.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,90 +15,102 @@ lint: |
1515
ansible-lint
1616
flake8
1717
platforms:
18-
- name: amazonlinux2-systemd
18+
- name: amazonlinux2-systemd-amd64
1919
image: geerlingguy/docker-amazonlinux2-ansible:latest
2020
privileged: yes
2121
volumes:
2222
- /sys/fs/cgroup:/sys/fs/cgroup:ro
2323
command: /lib/systemd/systemd
2424
pre_build_image: yes
25-
- name: debian9-systemd
25+
platform: amd64
26+
- name: debian9-systemd-amd64
2627
image: geerlingguy/docker-debian9-ansible:latest
2728
privileged: yes
2829
volumes:
2930
- /sys/fs/cgroup:/sys/fs/cgroup:ro
3031
command: /lib/systemd/systemd
3132
pre_build_image: yes
32-
- name: debian10-systemd
33+
platform: amd64
34+
- name: debian10-systemd-amd64
3335
image: geerlingguy/docker-debian10-ansible:latest
3436
privileged: yes
3537
volumes:
3638
- /sys/fs/cgroup:/sys/fs/cgroup:ro
3739
command: /lib/systemd/systemd
3840
pre_build_image: yes
39-
- name: debian11-systemd
41+
platform: amd64
42+
- name: debian11-systemd-amd64
4043
image: geerlingguy/docker-debian11-ansible:latest
4144
privileged: yes
4245
volumes:
4346
- /sys/fs/cgroup:/sys/fs/cgroup:ro
4447
command: /lib/systemd/systemd
4548
pre_build_image: yes
46-
- name: debian12-systemd
49+
platform: amd64
50+
- name: debian12-systemd-amd64
4751
image: cisagov/docker-debian12-ansible:latest
4852
privileged: yes
4953
volumes:
5054
- /sys/fs/cgroup:/sys/fs/cgroup:ro
5155
command: /lib/systemd/systemd
5256
pre_build_image: yes
53-
- name: kali-systemd
57+
platform: amd64
58+
- name: kali-systemd-amd64
5459
image: cisagov/docker-kali-ansible:latest
5560
privileged: yes
5661
volumes:
5762
- /sys/fs/cgroup:/sys/fs/cgroup:ro
5863
command: /lib/systemd/systemd
5964
pre_build_image: yes
60-
- name: fedora35-systemd
65+
platform: amd64
66+
- name: fedora35-systemd-amd64
6167
image: geerlingguy/docker-fedora35-ansible:latest
6268
privileged: yes
6369
volumes:
6470
- /sys/fs/cgroup:/sys/fs/cgroup:ro
6571
command: /lib/systemd/systemd
6672
pre_build_image: yes
67-
- name: fedora36-systemd
73+
platform: amd64
74+
- name: fedora36-systemd-amd64
6875
image: geerlingguy/docker-fedora36-ansible:latest
6976
privileged: yes
7077
volumes:
7178
- /sys/fs/cgroup:/sys/fs/cgroup:ro
7279
command: /lib/systemd/systemd
7380
pre_build_image: yes
74-
- name: fedora37-systemd
81+
platform: amd64
82+
- name: fedora37-systemd-amd64
7583
image: geerlingguy/docker-fedora37-ansible:latest
7684
privileged: yes
7785
volumes:
7886
- /sys/fs/cgroup:/sys/fs/cgroup:ro
7987
command: /lib/systemd/systemd
8088
pre_build_image: yes
81-
- name: ubuntu-18-systemd
89+
platform: amd64
90+
- name: ubuntu-18-systemd-amd64
8291
image: geerlingguy/docker-ubuntu1804-ansible:latest
8392
privileged: yes
8493
volumes:
8594
- /sys/fs/cgroup:/sys/fs/cgroup:ro
8695
command: /lib/systemd/systemd
8796
pre_build_image: yes
88-
- name: ubuntu-20-systemd
97+
platform: amd64
98+
- name: ubuntu-20-systemd-amd64
8999
image: geerlingguy/docker-ubuntu2004-ansible:latest
90100
privileged: yes
91101
volumes:
92102
- /sys/fs/cgroup:/sys/fs/cgroup:ro
93103
command: /lib/systemd/systemd
94104
pre_build_image: yes
95-
- name: ubuntu-22-systemd
105+
platform: amd64
106+
- name: ubuntu-22-systemd-amd64
96107
image: geerlingguy/docker-ubuntu2204-ansible:latest
97108
privileged: yes
98109
volumes:
99110
- /sys/fs/cgroup:/sys/fs/cgroup:ro
100111
command: /lib/systemd/systemd
101112
pre_build_image: yes
113+
platform: amd64
102114
provisioner:
103115
name: ansible
104116
inventory:

0 commit comments

Comments
 (0)