Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use amd64 platform for Molecule tests #231

Merged
merged 1 commit into from
Jan 14, 2023
Merged

Use amd64 platform for Molecule tests #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ The Alpine Linux `libelf` dependency is no longer automatically installed by NGI

TESTS:

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

## 0.8.1 (September 28, 2022)

Expand Down
5 changes: 5 additions & 0 deletions molecule/advanced/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ lint: |
platforms:
- name: test-workload
image: nginxdemos/hello
platform: amd64
privileged: true
groups:
- workload
Expand All @@ -19,6 +20,7 @@ platforms:
- name: centos-7
image: centos:7
dockerfile: ../common/Dockerfile.j2
platform: amd64
privileged: true
cgroupns_mode: host
volumes:
Expand All @@ -30,6 +32,7 @@ platforms:
- name: molecule-test
- name: debian-buster
image: debian:buster-slim
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -42,6 +45,7 @@ platforms:
- name: molecule-test
- name: ubuntu-bionic
image: ubuntu:bionic
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -54,6 +58,7 @@ platforms:
- name: molecule-test
- name: ubuntu-focal
image: ubuntu:focal
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down
7 changes: 7 additions & 0 deletions molecule/default/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ lint: |
platforms:
- name: amazonlinux-2
image: amazonlinux:2
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -15,6 +16,7 @@ platforms:
command: /usr/sbin/init
- name: centos-7
image: centos:7
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -23,6 +25,7 @@ platforms:
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7/ubi:7.9
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -31,6 +34,7 @@ platforms:
command: /usr/sbin/init
- name: rhel-8
image: registry.access.redhat.com/ubi8/ubi:8.5
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -39,6 +43,7 @@ platforms:
command: /usr/sbin/init
- name: debian-buster
image: debian:buster-slim
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -47,6 +52,7 @@ platforms:
command: /sbin/init
- name: ubuntu-bionic
image: ubuntu:bionic
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -55,6 +61,7 @@ platforms:
command: /sbin/init
- name: ubuntu-focal
image: ubuntu:focal
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down
8 changes: 8 additions & 0 deletions molecule/dos/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ lint: |
platforms:
- name: alpine-3.15
image: alpine:3.15
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -15,6 +16,7 @@ platforms:
command: /sbin/init
- name: centos-7
image: centos:7
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -23,6 +25,7 @@ platforms:
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7/ubi:7.9
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -31,6 +34,7 @@ platforms:
command: /usr/sbin/init
- name: rhel-8
image: registry.access.redhat.com/ubi8/ubi:8.5
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -39,6 +43,7 @@ platforms:
command: /usr/sbin/init
- name: debian-buster
image: debian:buster-slim
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -47,6 +52,7 @@ platforms:
command: /sbin/init
- name: debian-bullseye
image: debian:bullseye-slim
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -55,6 +61,7 @@ platforms:
command: /sbin/init
- name: ubuntu-bionic
image: ubuntu:bionic
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -63,6 +70,7 @@ platforms:
command: /sbin/init
- name: ubuntu-focal
image: ubuntu:focal
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down
5 changes: 5 additions & 0 deletions molecule/specific-version/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ lint: |
platforms:
- name: centos-7
image: centos:7
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -15,6 +16,7 @@ platforms:
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7/ubi:7.9
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -23,6 +25,7 @@ platforms:
command: /usr/sbin/init
- name: debian-buster
image: debian:buster-slim
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -31,6 +34,7 @@ platforms:
command: /sbin/init
- name: ubuntu-bionic
image: ubuntu:bionic
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -39,6 +43,7 @@ platforms:
command: /sbin/init
- name: ubuntu-focal
image: ubuntu:focal
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down
4 changes: 4 additions & 0 deletions molecule/uninstall/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ lint: |
platforms: # Ubuntu bionic and Debian buster result in a segmentation fault error as of Ansible core 2.13
- name: centos-7
image: centos:7
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -15,6 +16,7 @@ platforms: # Ubuntu bionic and Debian buster result in a segmentation fault erro
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7/ubi:7.9
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -23,6 +25,7 @@ platforms: # Ubuntu bionic and Debian buster result in a segmentation fault erro
command: /usr/sbin/init
- name: rhel-8
image: registry.access.redhat.com/ubi8/ubi:8.5
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -31,6 +34,7 @@ platforms: # Ubuntu bionic and Debian buster result in a segmentation fault erro
command: /usr/sbin/init
- name: ubuntu-focal
image: ubuntu:focal
platform: amd64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down