Skip to content

Commit 713f63b

Browse files
alessfgalessfg
committed
Use amd64 platform for Molecule tests (#572)
1 parent 8d792fd commit 713f63b

File tree

11 files changed

+217
-31
lines changed

11 files changed

+217
-31
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ BUG FIXES:
1818

1919
TESTS:
2020

21-
Update GitHub actions to run on Ubuntu 22.04 (and thus support `cgroups` v2).
21+
* Update GitHub actions to run on Ubuntu 22.04 (and thus support `cgroups` v2).
22+
* Explicitly specify `amd64` as the platform used in Molecule tests. This will ensure that tests work as expected when run on different host architectures (e.g. newer Macbooks with `arm` processors).
2223

2324
## 0.23.2 (September 28, 2022)
2425

‎molecule/default/molecule.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ lint: |
77
platforms:
88
- name: almalinux-8
99
image: almalinux:8
10+
platform: amd64
1011
dockerfile: ../common/Dockerfile.j2
1112
privileged: true
1213
cgroupns_mode: host
@@ -15,6 +16,7 @@ platforms:
1516
command: /usr/sbin/init
1617
- name: almalinux-9
1718
image: almalinux:9
19+
platform: amd64
1820
dockerfile: ../common/Dockerfile.j2
1921
privileged: true
2022
cgroupns_mode: host
@@ -23,6 +25,7 @@ platforms:
2325
command: /usr/sbin/init
2426
- name: alpine-3.14
2527
image: alpine:3.14
28+
platform: amd64
2629
dockerfile: ../common/Dockerfile.j2
2730
privileged: true
2831
cgroupns_mode: host
@@ -31,6 +34,7 @@ platforms:
3134
command: /sbin/init
3235
- name: alpine-3.15
3336
image: alpine:3.15
37+
platform: amd64
3438
dockerfile: ../common/Dockerfile.j2
3539
privileged: true
3640
cgroupns_mode: host
@@ -39,6 +43,7 @@ platforms:
3943
command: /sbin/init
4044
- name: alpine-3.16
4145
image: alpine:3.16
46+
platform: amd64
4247
dockerfile: ../common/Dockerfile.j2
4348
privileged: true
4449
cgroupns_mode: host
@@ -47,6 +52,7 @@ platforms:
4752
command: /sbin/init
4853
- name: alpine-3.17
4954
image: alpine:3.17
55+
platform: amd64
5056
dockerfile: ../common/Dockerfile.j2
5157
privileged: true
5258
cgroupns_mode: host
@@ -55,6 +61,7 @@ platforms:
5561
command: /sbin/init
5662
- name: amazonlinux-2
5763
image: amazonlinux:2
64+
platform: amd64
5865
dockerfile: ../common/Dockerfile.j2
5966
privileged: true
6067
cgroupns_mode: host
@@ -63,6 +70,7 @@ platforms:
6370
command: /usr/sbin/init
6471
- name: centos-7
6572
image: centos:7
73+
platform: amd64
6674
dockerfile: ../common/Dockerfile.j2
6775
privileged: true
6876
cgroupns_mode: host
@@ -71,6 +79,7 @@ platforms:
7179
command: /usr/sbin/init
7280
- name: debian-bullseye
7381
image: debian:bullseye-slim
82+
platform: amd64
7483
dockerfile: ../common/Dockerfile.j2
7584
privileged: true
7685
cgroupns_mode: host
@@ -79,6 +88,7 @@ platforms:
7988
command: /sbin/init
8089
- name: oraclelinux-7
8190
image: oraclelinux:7
91+
platform: amd64
8292
dockerfile: ../common/Dockerfile.j2
8393
privileged: true
8494
cgroupns_mode: host
@@ -87,6 +97,7 @@ platforms:
8797
command: /usr/sbin/init
8898
- name: oraclelinux-8
8999
image: oraclelinux:8
100+
platform: amd64
90101
dockerfile: ../common/Dockerfile.j2
91102
privileged: true
92103
cgroupns_mode: host
@@ -95,14 +106,16 @@ platforms:
95106
command: /usr/sbin/init
96107
- name: oraclelinux-9
97108
image: oraclelinux:9
109+
platform: amd64
98110
dockerfile: ../common/Dockerfile.j2
99111
privileged: true
100112
cgroupns_mode: host
101113
volumes:
102114
- /sys/fs/cgroup:/sys/fs/cgroup:rw
103115
command: /usr/sbin/init
104116
- name: rhel-7
105-
image: registry.access.redhat.com/ubi7/ubi:7.9
117+
image: registry.access.redhat.com/ubi7:7.9
118+
platform: amd64
106119
dockerfile: ../common/Dockerfile.j2
107120
privileged: true
108121
cgroupns_mode: host
@@ -111,6 +124,7 @@ platforms:
111124
command: /usr/sbin/init
112125
- name: rhel-8
113126
image: redhat/ubi8:8.7
127+
platform: amd64
114128
dockerfile: ../common/Dockerfile.j2
115129
privileged: true
116130
cgroupns_mode: host
@@ -119,6 +133,7 @@ platforms:
119133
command: /usr/sbin/init
120134
- name: rhel-9
121135
image: redhat/ubi9:9.1.0
136+
platform: amd64
122137
dockerfile: ../common/Dockerfile.j2
123138
privileged: true
124139
cgroupns_mode: host
@@ -127,6 +142,7 @@ platforms:
127142
command: /usr/sbin/init
128143
- name: rockylinux-8
129144
image: rockylinux:8
145+
platform: amd64
130146
dockerfile: ../common/Dockerfile.j2
131147
privileged: true
132148
cgroupns_mode: host
@@ -135,6 +151,7 @@ platforms:
135151
command: /usr/sbin/init
136152
- name: rockylinux-9
137153
image: rockylinux:9.0.20220720
154+
platform: amd64
138155
dockerfile: ../common/Dockerfile.j2
139156
privileged: true
140157
cgroupns_mode: host
@@ -143,6 +160,7 @@ platforms:
143160
command: /usr/sbin/init
144161
- name: sles15
145162
image: registry.suse.com/bci/bci-base:15.4
163+
platform: amd64
146164
dockerfile: ../common/Dockerfile.j2
147165
privileged: true
148166
cgroupns_mode: host
@@ -151,6 +169,7 @@ platforms:
151169
command: /usr/sbin/init
152170
- name: ubuntu-bionic
153171
image: ubuntu:bionic
172+
platform: amd64
154173
dockerfile: ../common/Dockerfile.j2
155174
privileged: true
156175
cgroupns_mode: host
@@ -159,6 +178,7 @@ platforms:
159178
command: /sbin/init
160179
- name: ubuntu-focal
161180
image: ubuntu:focal
181+
platform: amd64
162182
dockerfile: ../common/Dockerfile.j2
163183
privileged: true
164184
cgroupns_mode: host
@@ -167,6 +187,7 @@ platforms:
167187
command: /sbin/init
168188
- name: ubuntu-jammy
169189
image: ubuntu:jammy
190+
platform: amd64
170191
dockerfile: ../common/Dockerfile.j2
171192
privileged: true
172193
cgroupns_mode: host

‎molecule/downgrade/molecule.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ lint: |
77
platforms:
88
- name: almalinux-8
99
image: almalinux:8
10+
platform: amd64
1011
dockerfile: ../common/Dockerfile.j2
1112
privileged: true
1213
cgroupns_mode: host
@@ -15,6 +16,7 @@ platforms:
1516
command: /usr/sbin/init
1617
- name: almalinux-9
1718
image: almalinux:9
19+
platform: amd64
1820
dockerfile: ../common/Dockerfile.j2
1921
privileged: true
2022
cgroupns_mode: host
@@ -23,6 +25,7 @@ platforms:
2325
command: /usr/sbin/init
2426
- name: alpine-3.14
2527
image: alpine:3.14
28+
platform: amd64
2629
dockerfile: ../common/Dockerfile.j2
2730
privileged: true
2831
cgroupns_mode: host
@@ -31,6 +34,7 @@ platforms:
3134
command: /sbin/init
3235
- name: alpine-3.15
3336
image: alpine:3.15
37+
platform: amd64
3438
dockerfile: ../common/Dockerfile.j2
3539
privileged: true
3640
cgroupns_mode: host
@@ -39,6 +43,7 @@ platforms:
3943
command: /sbin/init
4044
- name: alpine-3.16
4145
image: alpine:3.16
46+
platform: amd64
4247
dockerfile: ../common/Dockerfile.j2
4348
privileged: true
4449
cgroupns_mode: host
@@ -47,6 +52,7 @@ platforms:
4752
command: /sbin/init
4853
- name: alpine-3.17
4954
image: alpine:3.17
55+
platform: amd64
5056
dockerfile: ../common/Dockerfile.j2
5157
privileged: true
5258
cgroupns_mode: host
@@ -55,6 +61,7 @@ platforms:
5561
command: /sbin/init
5662
- name: amazonlinux-2
5763
image: amazonlinux:2
64+
platform: amd64
5865
dockerfile: ../common/Dockerfile.j2
5966
privileged: true
6067
cgroupns_mode: host
@@ -63,6 +70,7 @@ platforms:
6370
command: /usr/sbin/init
6471
- name: centos-7
6572
image: centos:7
73+
platform: amd64
6674
dockerfile: ../common/Dockerfile.j2
6775
privileged: true
6876
cgroupns_mode: host
@@ -71,6 +79,7 @@ platforms:
7179
command: /usr/sbin/init
7280
- name: debian-bullseye
7381
image: debian:bullseye-slim
82+
platform: amd64
7483
dockerfile: ../common/Dockerfile.j2
7584
privileged: true
7685
cgroupns_mode: host
@@ -79,6 +88,7 @@ platforms:
7988
command: /sbin/init
8089
- name: oraclelinux-7
8190
image: oraclelinux:7
91+
platform: amd64
8292
dockerfile: ../common/Dockerfile.j2
8393
privileged: true
8494
cgroupns_mode: host
@@ -87,6 +97,7 @@ platforms:
8797
command: /usr/sbin/init
8898
- name: oraclelinux-8
8999
image: oraclelinux:8
100+
platform: amd64
90101
dockerfile: ../common/Dockerfile.j2
91102
privileged: true
92103
cgroupns_mode: host
@@ -95,14 +106,16 @@ platforms:
95106
command: /usr/sbin/init
96107
- name: oraclelinux-9
97108
image: oraclelinux:9
109+
platform: amd64
98110
dockerfile: ../common/Dockerfile.j2
99111
privileged: true
100112
cgroupns_mode: host
101113
volumes:
102114
- /sys/fs/cgroup:/sys/fs/cgroup:rw
103115
command: /usr/sbin/init
104116
- name: rhel-7
105-
image: registry.access.redhat.com/ubi7/ubi:7.9
117+
image: registry.access.redhat.com/ubi7:7.9
118+
platform: amd64
106119
dockerfile: ../common/Dockerfile.j2
107120
privileged: true
108121
cgroupns_mode: host
@@ -111,6 +124,7 @@ platforms:
111124
command: /usr/sbin/init
112125
- name: rhel-8
113126
image: redhat/ubi8:8.7
127+
platform: amd64
114128
dockerfile: ../common/Dockerfile.j2
115129
privileged: true
116130
cgroupns_mode: host
@@ -119,6 +133,7 @@ platforms:
119133
command: /usr/sbin/init
120134
- name: rhel-9
121135
image: redhat/ubi9:9.1.0
136+
platform: amd64
122137
dockerfile: ../common/Dockerfile.j2
123138
privileged: true
124139
cgroupns_mode: host
@@ -127,6 +142,7 @@ platforms:
127142
command: /usr/sbin/init
128143
- name: rockylinux-8
129144
image: rockylinux:8
145+
platform: amd64
130146
dockerfile: ../common/Dockerfile.j2
131147
privileged: true
132148
cgroupns_mode: host
@@ -135,6 +151,7 @@ platforms:
135151
command: /usr/sbin/init
136152
- name: rockylinux-9
137153
image: rockylinux:9.0.20220720
154+
platform: amd64
138155
dockerfile: ../common/Dockerfile.j2
139156
privileged: true
140157
cgroupns_mode: host
@@ -143,6 +160,7 @@ platforms:
143160
command: /usr/sbin/init
144161
- name: sles15
145162
image: registry.suse.com/bci/bci-base:15.4
163+
platform: amd64
146164
dockerfile: ../common/Dockerfile.j2
147165
privileged: true
148166
cgroupns_mode: host
@@ -151,6 +169,7 @@ platforms:
151169
command: /usr/sbin/init
152170
- name: ubuntu-bionic
153171
image: ubuntu:bionic
172+
platform: amd64
154173
dockerfile: ../common/Dockerfile.j2
155174
privileged: true
156175
cgroupns_mode: host
@@ -159,6 +178,7 @@ platforms:
159178
command: /sbin/init
160179
- name: ubuntu-focal
161180
image: ubuntu:focal
181+
platform: amd64
162182
dockerfile: ../common/Dockerfile.j2
163183
privileged: true
164184
cgroupns_mode: host
@@ -167,6 +187,7 @@ platforms:
167187
command: /sbin/init
168188
- name: ubuntu-jammy
169189
image: ubuntu:jammy
190+
platform: amd64
170191
dockerfile: ../common/Dockerfile.j2
171192
privileged: true
172193
cgroupns_mode: host

0 commit comments

Comments
 (0)