Skip to content

Commit 72d4475

Browse files
alessfgalessfg
authored
Update Molecule platform data (#576)
1 parent 543a707 commit 72d4475

File tree

11 files changed

+25
-161
lines changed

11 files changed

+25
-161
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ BUG FIXES:
3737
TESTS:
3838

3939
* Update GitHub actions to run on Ubuntu 22.04 (and thus support `cgroups` v2).
40-
* 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).
40+
* Explicitly specify `amd64` as the platform used in the Amazon Linux 2/CentOS/Oracle Linux/RHEL 7/SLES 15 Molecule Docker images. This will ensure that tests work when run on different host architectures (e.g. newer Macbooks with `arm64` processors) when running tests in distributions that only support `amd64` (either due to lack of support for a `cgroups` v2 backport or due to lack of builds for `arm64`).
4141

4242
## 0.23.2 (September 28, 2022)
4343

‎molecule/default/molecule.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ lint: |
77
platforms:
88
- name: almalinux-8
99
image: almalinux:8
10-
platform: amd64
1110
dockerfile: ../common/Dockerfile.j2
1211
privileged: true
1312
cgroupns_mode: host
@@ -16,7 +15,6 @@ platforms:
1615
command: /usr/sbin/init
1716
- name: almalinux-9
1817
image: almalinux:9
19-
platform: amd64
2018
dockerfile: ../common/Dockerfile.j2
2119
privileged: true
2220
cgroupns_mode: host
@@ -25,7 +23,6 @@ platforms:
2523
command: /usr/sbin/init
2624
- name: alpine-3.14
2725
image: alpine:3.14
28-
platform: amd64
2926
dockerfile: ../common/Dockerfile.j2
3027
privileged: true
3128
cgroupns_mode: host
@@ -34,7 +31,6 @@ platforms:
3431
command: /sbin/init
3532
- name: alpine-3.15
3633
image: alpine:3.15
37-
platform: amd64
3834
dockerfile: ../common/Dockerfile.j2
3935
privileged: true
4036
cgroupns_mode: host
@@ -43,7 +39,6 @@ platforms:
4339
command: /sbin/init
4440
- name: alpine-3.16
4541
image: alpine:3.16
46-
platform: amd64
4742
dockerfile: ../common/Dockerfile.j2
4843
privileged: true
4944
cgroupns_mode: host
@@ -52,7 +47,6 @@ platforms:
5247
command: /sbin/init
5348
- name: alpine-3.17
5449
image: alpine:3.17
55-
platform: amd64
5650
dockerfile: ../common/Dockerfile.j2
5751
privileged: true
5852
cgroupns_mode: host
@@ -79,7 +73,6 @@ platforms:
7973
command: /usr/sbin/init
8074
- name: debian-bullseye
8175
image: debian:bullseye-slim
82-
platform: amd64
8376
dockerfile: ../common/Dockerfile.j2
8477
privileged: true
8578
cgroupns_mode: host
@@ -97,7 +90,6 @@ platforms:
9790
command: /usr/sbin/init
9891
- name: oraclelinux-8
9992
image: oraclelinux:8
100-
platform: amd64
10193
dockerfile: ../common/Dockerfile.j2
10294
privileged: true
10395
cgroupns_mode: host
@@ -106,7 +98,6 @@ platforms:
10698
command: /usr/sbin/init
10799
- name: oraclelinux-9
108100
image: oraclelinux:9
109-
platform: amd64
110101
dockerfile: ../common/Dockerfile.j2
111102
privileged: true
112103
cgroupns_mode: host
@@ -124,7 +115,6 @@ platforms:
124115
command: /usr/sbin/init
125116
- name: rhel-8
126117
image: redhat/ubi8:8.7
127-
platform: amd64
128118
dockerfile: ../common/Dockerfile.j2
129119
privileged: true
130120
cgroupns_mode: host
@@ -133,7 +123,6 @@ platforms:
133123
command: /usr/sbin/init
134124
- name: rhel-9
135125
image: redhat/ubi9:9.1.0
136-
platform: amd64
137126
dockerfile: ../common/Dockerfile.j2
138127
privileged: true
139128
cgroupns_mode: host
@@ -142,7 +131,6 @@ platforms:
142131
command: /usr/sbin/init
143132
- name: rockylinux-8
144133
image: rockylinux:8
145-
platform: amd64
146134
dockerfile: ../common/Dockerfile.j2
147135
privileged: true
148136
cgroupns_mode: host
@@ -151,7 +139,6 @@ platforms:
151139
command: /usr/sbin/init
152140
- name: rockylinux-9
153141
image: rockylinux:9.0.20220720
154-
platform: amd64
155142
dockerfile: ../common/Dockerfile.j2
156143
privileged: true
157144
cgroupns_mode: host
@@ -169,7 +156,6 @@ platforms:
169156
command: /usr/sbin/init
170157
- name: ubuntu-bionic
171158
image: ubuntu:bionic
172-
platform: amd64
173159
dockerfile: ../common/Dockerfile.j2
174160
privileged: true
175161
cgroupns_mode: host
@@ -178,7 +164,6 @@ platforms:
178164
command: /sbin/init
179165
- name: ubuntu-focal
180166
image: ubuntu:focal
181-
platform: amd64
182167
dockerfile: ../common/Dockerfile.j2
183168
privileged: true
184169
cgroupns_mode: host
@@ -187,7 +172,6 @@ platforms:
187172
command: /sbin/init
188173
- name: ubuntu-jammy
189174
image: ubuntu:jammy
190-
platform: amd64
191175
dockerfile: ../common/Dockerfile.j2
192176
privileged: true
193177
cgroupns_mode: host

‎molecule/downgrade/molecule.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ lint: |
77
platforms:
88
- name: almalinux-8
99
image: almalinux:8
10-
platform: amd64
1110
dockerfile: ../common/Dockerfile.j2
1211
privileged: true
1312
cgroupns_mode: host
@@ -16,7 +15,6 @@ platforms:
1615
command: /usr/sbin/init
1716
- name: almalinux-9
1817
image: almalinux:9
19-
platform: amd64
2018
dockerfile: ../common/Dockerfile.j2
2119
privileged: true
2220
cgroupns_mode: host
@@ -25,7 +23,6 @@ platforms:
2523
command: /usr/sbin/init
2624
- name: alpine-3.14
2725
image: alpine:3.14
28-
platform: amd64
2926
dockerfile: ../common/Dockerfile.j2
3027
privileged: true
3128
cgroupns_mode: host
@@ -34,7 +31,6 @@ platforms:
3431
command: /sbin/init
3532
- name: alpine-3.15
3633
image: alpine:3.15
37-
platform: amd64
3834
dockerfile: ../common/Dockerfile.j2
3935
privileged: true
4036
cgroupns_mode: host
@@ -43,7 +39,6 @@ platforms:
4339
command: /sbin/init
4440
- name: alpine-3.16
4541
image: alpine:3.16
46-
platform: amd64
4742
dockerfile: ../common/Dockerfile.j2
4843
privileged: true
4944
cgroupns_mode: host
@@ -52,7 +47,6 @@ platforms:
5247
command: /sbin/init
5348
- name: alpine-3.17
5449
image: alpine:3.17
55-
platform: amd64
5650
dockerfile: ../common/Dockerfile.j2
5751
privileged: true
5852
cgroupns_mode: host
@@ -79,7 +73,6 @@ platforms:
7973
command: /usr/sbin/init
8074
- name: debian-bullseye
8175
image: debian:bullseye-slim
82-
platform: amd64
8376
dockerfile: ../common/Dockerfile.j2
8477
privileged: true
8578
cgroupns_mode: host
@@ -97,7 +90,6 @@ platforms:
9790
command: /usr/sbin/init
9891
- name: oraclelinux-8
9992
image: oraclelinux:8
100-
platform: amd64
10193
dockerfile: ../common/Dockerfile.j2
10294
privileged: true
10395
cgroupns_mode: host
@@ -106,7 +98,6 @@ platforms:
10698
command: /usr/sbin/init
10799
- name: oraclelinux-9
108100
image: oraclelinux:9
109-
platform: amd64
110101
dockerfile: ../common/Dockerfile.j2
111102
privileged: true
112103
cgroupns_mode: host
@@ -124,7 +115,6 @@ platforms:
124115
command: /usr/sbin/init
125116
- name: rhel-8
126117
image: redhat/ubi8:8.7
127-
platform: amd64
128118
dockerfile: ../common/Dockerfile.j2
129119
privileged: true
130120
cgroupns_mode: host
@@ -133,7 +123,6 @@ platforms:
133123
command: /usr/sbin/init
134124
- name: rhel-9
135125
image: redhat/ubi9:9.1.0
136-
platform: amd64
137126
dockerfile: ../common/Dockerfile.j2
138127
privileged: true
139128
cgroupns_mode: host
@@ -142,7 +131,6 @@ platforms:
142131
command: /usr/sbin/init
143132
- name: rockylinux-8
144133
image: rockylinux:8
145-
platform: amd64
146134
dockerfile: ../common/Dockerfile.j2
147135
privileged: true
148136
cgroupns_mode: host
@@ -151,7 +139,6 @@ platforms:
151139
command: /usr/sbin/init
152140
- name: rockylinux-9
153141
image: rockylinux:9.0.20220720
154-
platform: amd64
155142
dockerfile: ../common/Dockerfile.j2
156143
privileged: true
157144
cgroupns_mode: host
@@ -169,7 +156,6 @@ platforms:
169156
command: /usr/sbin/init
170157
- name: ubuntu-bionic
171158
image: ubuntu:bionic
172-
platform: amd64
173159
dockerfile: ../common/Dockerfile.j2
174160
privileged: true
175161
cgroupns_mode: host
@@ -178,7 +164,6 @@ platforms:
178164
command: /sbin/init
179165
- name: ubuntu-focal
180166
image: ubuntu:focal
181-
platform: amd64
182167
dockerfile: ../common/Dockerfile.j2
183168
privileged: true
184169
cgroupns_mode: host
@@ -187,7 +172,6 @@ platforms:
187172
command: /sbin/init
188173
- name: ubuntu-jammy
189174
image: ubuntu:jammy
190-
platform: amd64
191175
dockerfile: ../common/Dockerfile.j2
192176
privileged: true
193177
cgroupns_mode: host

‎molecule/downgrade_plus/molecule.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ lint: |
77
platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the moment) so it's impossible to test the downgrade scenario
88
- name: almalinux-8
99
image: almalinux:8
10-
platform: amd64
1110
dockerfile: ../common/Dockerfile.j2
1211
privileged: true
1312
cgroupns_mode: host
@@ -16,16 +15,22 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo
1615
command: /usr/sbin/init
1716
- name: almalinux-9
1817
image: almalinux:9
19-
platform: amd64
2018
dockerfile: ../common/Dockerfile.j2
2119
privileged: true
2220
cgroupns_mode: host
2321
volumes:
2422
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2523
command: /usr/sbin/init
24+
- name: alpine-3.13
25+
image: alpine:3.13
26+
dockerfile: ../common/Dockerfile.j2
27+
privileged: true
28+
cgroupns_mode: host
29+
volumes:
30+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
31+
command: /sbin/init
2632
- name: alpine-3.14
2733
image: alpine:3.14
28-
platform: amd64
2934
dockerfile: ../common/Dockerfile.j2
3035
privileged: true
3136
cgroupns_mode: host
@@ -34,7 +39,6 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo
3439
command: /sbin/init
3540
- name: alpine-3.15
3641
image: alpine:3.15
37-
platform: amd64
3842
dockerfile: ../common/Dockerfile.j2
3943
privileged: true
4044
cgroupns_mode: host
@@ -43,7 +47,6 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo
4347
command: /sbin/init
4448
- name: alpine-3.16
4549
image: alpine:3.16
46-
platform: amd64
4750
dockerfile: ../common/Dockerfile.j2
4851
privileged: true
4952
cgroupns_mode: host
@@ -70,7 +73,6 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo
7073
command: /usr/sbin/init
7174
- name: debian-bullseye
7275
image: debian:bullseye-slim
73-
platform: amd64
7476
dockerfile: ../common/Dockerfile.j2
7577
privileged: true
7678
cgroupns_mode: host
@@ -88,7 +90,6 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo
8890
command: /usr/sbin/init
8991
- name: oraclelinux-8
9092
image: oraclelinux:8
91-
platform: amd64
9293
dockerfile: ../common/Dockerfile.j2
9394
privileged: true
9495
cgroupns_mode: host
@@ -97,7 +98,6 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo
9798
command: /usr/sbin/init
9899
- name: oraclelinux-9
99100
image: oraclelinux:9
100-
platform: amd64
101101
dockerfile: ../common/Dockerfile.j2
102102
privileged: true
103103
cgroupns_mode: host
@@ -115,7 +115,6 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo
115115
command: /usr/sbin/init
116116
- name: rhel-8
117117
image: redhat/ubi8:8.7
118-
platform: amd64
119118
dockerfile: ../common/Dockerfile.j2
120119
privileged: true
121120
cgroupns_mode: host
@@ -124,7 +123,6 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo
124123
command: /usr/sbin/init
125124
- name: rhel-9
126125
image: redhat/ubi9:9.1.0
127-
platform: amd64
128126
dockerfile: ../common/Dockerfile.j2
129127
privileged: true
130128
cgroupns_mode: host
@@ -133,7 +131,6 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo
133131
command: /usr/sbin/init
134132
- name: rockylinux-8
135133
image: rockylinux:8
136-
platform: amd64
137134
dockerfile: ../common/Dockerfile.j2
138135
privileged: true
139136
cgroupns_mode: host
@@ -142,7 +139,6 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo
142139
command: /usr/sbin/init
143140
- name: rockylinux-9
144141
image: rockylinux:9.0.20220720
145-
platform: amd64
146142
dockerfile: ../common/Dockerfile.j2
147143
privileged: true
148144
cgroupns_mode: host
@@ -160,7 +156,6 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo
160156
command: /usr/sbin/init
161157
- name: ubuntu-bionic
162158
image: ubuntu:bionic
163-
platform: amd64
164159
dockerfile: ../common/Dockerfile.j2
165160
privileged: true
166161
cgroupns_mode: host
@@ -169,7 +164,6 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo
169164
command: /sbin/init
170165
- name: ubuntu-focal
171166
image: ubuntu:focal
172-
platform: amd64
173167
dockerfile: ../common/Dockerfile.j2
174168
privileged: true
175169
cgroupns_mode: host
@@ -178,7 +172,6 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo
178172
command: /sbin/init
179173
- name: ubuntu-jammy
180174
image: ubuntu:jammy
181-
platform: amd64
182175
dockerfile: ../common/Dockerfile.j2
183176
privileged: true
184177
cgroupns_mode: host

0 commit comments

Comments
 (0)