Skip to content

Commit 05978e3

Browse files
authored
Use amd64 platform for Molecule tests (#300)
1 parent d86119b commit 05978e3

File tree

5 files changed

+16
-1
lines changed

5 files changed

+16
-1
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ GitHub actions should now correctly skip \*plus\* scenarios only when the NGINX
1212

1313
TESTS:
1414

15-
Update GitHub actions to run on Ubuntu 22.04 (and thus support `cgroups` v2).
15+
* Update GitHub actions to run on Ubuntu 22.04 (and thus support `cgroups` v2).
16+
* 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).
1617

1718
## 0.5.2 (October 17, 2022)
1819

molecule/cleanup_module/molecule.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ lint: |
1111
platforms:
1212
- name: alpine-3.17
1313
image: alpine:3.17
14+
platform: amd64
1415
dockerfile: ../common/Dockerfile.j2
1516
privileged: true
1617
cgroupns_mode: host
@@ -19,6 +20,7 @@ platforms:
1920
command: /sbin/init
2021
- name: rhel-9
2122
image: redhat/ubi9:9.1.0
23+
platform: amd64
2224
dockerfile: ../common/Dockerfile.j2
2325
privileged: true
2426
cgroupns_mode: host
@@ -27,6 +29,7 @@ platforms:
2729
command: /usr/sbin/init
2830
- name: debian-bullseye
2931
image: debian:bullseye-slim
32+
platform: amd64
3033
dockerfile: ../common/Dockerfile.j2
3134
privileged: true
3235
cgroupns_mode: host
@@ -35,6 +38,7 @@ platforms:
3538
command: /sbin/init
3639
- name: ubuntu-jammy
3740
image: ubuntu:jammy
41+
platform: amd64
3842
dockerfile: ../common/Dockerfile.j2
3943
privileged: true
4044
cgroupns_mode: host

molecule/default/molecule.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ lint: |
1111
platforms:
1212
- name: alpine-3.17
1313
image: alpine:3.17
14+
platform: amd64
1415
dockerfile: ../common/Dockerfile.j2
1516
privileged: true
1617
cgroupns_mode: host
@@ -19,6 +20,7 @@ platforms:
1920
command: /sbin/init
2021
- name: rhel-9
2122
image: redhat/ubi9:9.1.0
23+
platform: amd64
2224
dockerfile: ../common/Dockerfile.j2
2325
privileged: true
2426
cgroupns_mode: host
@@ -27,6 +29,7 @@ platforms:
2729
command: /usr/sbin/init
2830
- name: debian-bullseye
2931
image: debian:bullseye-slim
32+
platform: amd64
3033
dockerfile: ../common/Dockerfile.j2
3134
privileged: true
3235
cgroupns_mode: host
@@ -35,6 +38,7 @@ platforms:
3538
command: /sbin/init
3639
- name: ubuntu-jammy
3740
image: ubuntu:jammy
41+
platform: amd64
3842
dockerfile: ../common/Dockerfile.j2
3943
privileged: true
4044
cgroupns_mode: host

molecule/plus/molecule.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ lint: |
1111
platforms:
1212
- name: centos-7
1313
image: centos:7
14+
platform: amd64
1415
dockerfile: ../common/Dockerfile.j2
1516
privileged: true
1617
cgroupns_mode: host
@@ -19,6 +20,7 @@ platforms:
1920
command: /usr/sbin/init
2021
- name: ubuntu-bionic
2122
image: ubuntu:bionic
23+
platform: amd64
2224
dockerfile: ../common/Dockerfile.j2
2325
privileged: true
2426
cgroupns_mode: host

molecule/stable_push/molecule.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ lint: |
1111
platforms:
1212
- name: alpine-3.17
1313
image: alpine:3.17
14+
platform: amd64
1415
dockerfile: ../common/Dockerfile.j2
1516
privileged: true
1617
cgroupns_mode: host
@@ -19,6 +20,7 @@ platforms:
1920
command: /sbin/init
2021
- name: rhel-9
2122
image: redhat/ubi9:9.1.0
23+
platform: amd64
2224
dockerfile: ../common/Dockerfile.j2
2325
privileged: true
2426
cgroupns_mode: host
@@ -27,6 +29,7 @@ platforms:
2729
command: /usr/sbin/init
2830
- name: debian-bullseye
2931
image: debian:bullseye-slim
32+
platform: amd64
3033
dockerfile: ../common/Dockerfile.j2
3134
privileged: true
3235
cgroupns_mode: host
@@ -35,6 +38,7 @@ platforms:
3538
command: /sbin/init
3639
- name: ubuntu-jammy
3740
image: ubuntu:jammy
41+
platform: amd64
3842
dockerfile: ../common/Dockerfile.j2
3943
privileged: true
4044
cgroupns_mode: host

0 commit comments

Comments
 (0)