Skip to content

Explicitly use x86_64 in certain Molecule scenarios #659

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

Merged
merged 3 commits into from
Sep 18, 2023
Merged

Explicitly use x86_64 in certain Molecule scenarios #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b616e29
Remove Ubuntu kinetic
alessfg Sep 18, 2023
e73b85c
Explicitly use `x86_64` in certain Molecule scenarios
alessfg Sep 18, 2023
f32ae8d
Merge branch 'main' into add-x86-64
alessfg Sep 18, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ CI/CD:

- Reimplement some platforms in the upgrade & downgrade Molecule scenarios since all platforms now have at least two releases.
- Replace the hardcoded NGINX version check in multiple Molecule scenarios with a dynamic NGINX version check.
- Explicitly specify the `x86_64` platform in certain Molecule scenarios to avoid compatibility issues in ARM based computers.

## 0.24.1 (July 6, 2023)

Expand Down
12 changes: 6 additions & 6 deletions molecule/default/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ platforms:
command: /sbin/init
- name: alpine-3.16
image: alpine:3.16
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -54,7 +54,7 @@ platforms:
command: /sbin/init
- name: amazonlinux-2
image: amazonlinux:2
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -63,7 +63,7 @@ platforms:
command: /usr/sbin/init
- name: centos-7
image: centos:7
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -88,7 +88,7 @@ platforms:
command: /sbin/init
- name: oraclelinux-7
image: oraclelinux:7
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -113,7 +113,7 @@ platforms:
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7:7.9
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down Expand Up @@ -156,7 +156,7 @@ platforms:
command: /usr/sbin/init
- name: sles15
image: registry.suse.com/bci/bci-base:15.4
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down
12 changes: 6 additions & 6 deletions molecule/distribution/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
command: /sbin/init
- name: alpine-3.16
image: alpine:3.16
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -54,7 +54,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
command: /sbin/init
- name: amazonlinux-2
image: amazonlinux:2
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -63,7 +63,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
command: /usr/sbin/init
- name: centos-7
image: centos:7
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -88,7 +88,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
command: /sbin/init
- name: oraclelinux-7
image: oraclelinux:7
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down Expand Up @@ -156,7 +156,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
command: /usr/sbin/init
- name: sles15
image: registry.suse.com/bci/bci-base:15.4
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -165,7 +165,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
command: /usr/sbin/init
- name: ubuntu-bionic
image: ubuntu:bionic
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down
12 changes: 6 additions & 6 deletions molecule/downgrade-plus/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus
command: /sbin/init
- name: alpine-3.16
image: alpine:3.16
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -54,7 +54,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus
# command: /sbin/init
- name: amazonlinux-2
image: amazonlinux:2
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -63,7 +63,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus
command: /usr/sbin/init
- name: centos-7
image: centos:7
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -88,7 +88,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus
# command: /sbin/init
- name: oraclelinux-7
image: oraclelinux:7
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -113,7 +113,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7:7.9
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down Expand Up @@ -156,7 +156,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus
command: /usr/sbin/init
- name: sles15
image: registry.suse.com/bci/bci-base:15.4
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down
12 changes: 6 additions & 6 deletions molecule/downgrade/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ platforms:
command: /sbin/init
- name: alpine-3.16
image: alpine:3.16
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -54,7 +54,7 @@ platforms:
command: /sbin/init
- name: amazonlinux-2
image: amazonlinux:2
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -63,7 +63,7 @@ platforms:
command: /usr/sbin/init
- name: centos-7
image: centos:7
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -88,7 +88,7 @@ platforms:
command: /sbin/init
- name: oraclelinux-7
image: oraclelinux:7
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -113,7 +113,7 @@ platforms:
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7:7.9
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down Expand Up @@ -156,7 +156,7 @@ platforms:
command: /usr/sbin/init
- name: sles15
image: registry.suse.com/bci/bci-base:15.4
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down
12 changes: 6 additions & 6 deletions molecule/plus/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ platforms:
command: /sbin/init
- name: alpine-3.16
image: alpine:3.16
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -54,7 +54,7 @@ platforms:
command: /sbin/init
- name: amazonlinux-2
image: amazonlinux:2
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -63,7 +63,7 @@ platforms:
command: /usr/sbin/init
- name: centos-7
image: centos:7
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -88,7 +88,7 @@ platforms:
command: /sbin/init
- name: oraclelinux-7
image: oraclelinux:7
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -113,7 +113,7 @@ platforms:
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7:7.9
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down Expand Up @@ -156,7 +156,7 @@ platforms:
command: /usr/sbin/init
- name: sles15
image: registry.suse.com/bci/bci-base:15.4
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down
10 changes: 5 additions & 5 deletions molecule/source/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
command: /sbin/init
- name: alpine-3.16
image: alpine:3.16
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -54,7 +54,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
command: /sbin/init
- name: amazonlinux-2
image: amazonlinux:2
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -63,7 +63,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
command: /usr/sbin/init
- name: centos-7
image: centos:7
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down Expand Up @@ -104,7 +104,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7:7.9
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down Expand Up @@ -147,7 +147,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
command: /usr/sbin/init
- name: sles15
image: registry.suse.com/bci/bci-base:15.4
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down
12 changes: 6 additions & 6 deletions molecule/stable/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ platforms:
command: /sbin/init
- name: alpine-3.16
image: alpine:3.16
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -54,7 +54,7 @@ platforms:
command: /sbin/init
- name: amazonlinux-2
image: amazonlinux:2
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -63,7 +63,7 @@ platforms:
command: /usr/sbin/init
- name: centos-7
image: centos:7
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -88,7 +88,7 @@ platforms:
command: /sbin/init
- name: oraclelinux-7
image: oraclelinux:7
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand All @@ -113,7 +113,7 @@ platforms:
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7:7.9
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down Expand Up @@ -156,7 +156,7 @@ platforms:
command: /usr/sbin/init
- name: sles15
image: registry.suse.com/bci/bci-base:15.4
# platform: x86_64
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
Expand Down
Loading