From 9bed9011ef1082ed1d09475a95101fef10bd8ff2 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 26 Jan 2023 16:40:39 +0100 Subject: [PATCH 01/14] Add s390x as a platform for Molecule tests --- CHANGELOG.md | 4 +++- molecule/default/molecule.yml | 17 +++++++++----- molecule/downgrade/molecule.yml | 17 +++++++++----- molecule/downgrade_plus/molecule.yml | 16 +++++++++----- molecule/module/molecule.yml | 17 +++++++++----- molecule/plus/molecule.yml | 17 +++++++++----- molecule/source/molecule.yml | 33 ++++++++++------------------ molecule/uninstall/molecule.yml | 19 +++++++++++----- molecule/uninstall_plus/molecule.yml | 18 ++++++++++----- molecule/upgrade/molecule.yml | 17 +++++++++----- molecule/upgrade_plus/molecule.yml | 16 +++++++++----- vars/main.yml | 4 ++-- 12 files changed, 124 insertions(+), 71 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 493c1a827..7605a775e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,11 +35,13 @@ BUG FIXES: * GitHub actions should now correctly skip \*plus\* scenarios only when the NGINX Plus license secrets are not present. * Update the versions of the various packages required to build NGINX from source. The version of `zlib` listed in the role was no longer available. * The `ignore-tags` GitHub actions key does not exist. Replace it with the correct key, `tags-ignore`. +* Remove the `arch` option from the Debian family NGINX repository source. In its current form this prevented the role from working any platforms beyond `x86_64`/`amd64` and `aarch64`/`arm64`. TESTS: * Update GitHub actions to run on Ubuntu 22.04 (and thus support `cgroups` v2). -* 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`). +* Explicitly specify `x86_64`/`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 `aarch64`/`arm64` processors) when running tests in distributions that only support `x86_64` (either due to lack of support for a `cgroups` v2 backport or due to lack of builds for `aarch64`). +* Test some distributions using `aarch64` and `s390x` architectures. This should ensure the role works as intended across the various architectures that are officially supported. ## 0.23.2 (September 28, 2022) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 1d26ef401..f80a7e6fe 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -39,6 +39,7 @@ platforms: command: /sbin/init - name: alpine-3.16 image: alpine:3.16 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -47,6 +48,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -55,7 +57,7 @@ platforms: command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -64,7 +66,7 @@ platforms: command: /usr/sbin/init - name: centos-7 image: centos:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -81,7 +83,7 @@ platforms: command: /sbin/init - name: oraclelinux-7 image: oraclelinux:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -106,7 +108,7 @@ platforms: command: /usr/sbin/init - name: rhel-7 image: registry.access.redhat.com/ubi7:7.9 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -115,6 +117,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -123,6 +126,7 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -147,7 +151,7 @@ platforms: command: /usr/sbin/init - name: sles15 image: registry.suse.com/bci/bci-base:15.4 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -156,6 +160,7 @@ platforms: command: /usr/sbin/init - name: ubuntu-bionic image: ubuntu:bionic + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -164,6 +169,7 @@ platforms: command: /sbin/init - name: ubuntu-focal image: ubuntu:focal + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -172,6 +178,7 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/downgrade/molecule.yml b/molecule/downgrade/molecule.yml index a79355918..1e4adb0db 100644 --- a/molecule/downgrade/molecule.yml +++ b/molecule/downgrade/molecule.yml @@ -39,6 +39,7 @@ platforms: command: /sbin/init - name: alpine-3.16 image: alpine:3.16 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -47,6 +48,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -55,7 +57,7 @@ platforms: command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -64,7 +66,7 @@ platforms: command: /usr/sbin/init - name: centos-7 image: centos:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -81,7 +83,7 @@ platforms: command: /sbin/init - name: oraclelinux-7 image: oraclelinux:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -106,7 +108,7 @@ platforms: command: /usr/sbin/init - name: rhel-7 image: registry.access.redhat.com/ubi7:7.9 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -115,6 +117,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -123,6 +126,7 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -147,7 +151,7 @@ platforms: command: /usr/sbin/init - name: sles15 image: registry.suse.com/bci/bci-base:15.4 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -156,6 +160,7 @@ platforms: command: /usr/sbin/init - name: ubuntu-bionic image: ubuntu:bionic + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -164,6 +169,7 @@ platforms: command: /sbin/init - name: ubuntu-focal image: ubuntu:focal + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -172,6 +178,7 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/downgrade_plus/molecule.yml b/molecule/downgrade_plus/molecule.yml index 8fe40368f..6479dcd53 100644 --- a/molecule/downgrade_plus/molecule.yml +++ b/molecule/downgrade_plus/molecule.yml @@ -47,6 +47,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /sbin/init - name: alpine-3.16 image: alpine:3.16 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -55,7 +56,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -64,7 +65,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /usr/sbin/init - name: centos-7 image: centos:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -81,7 +82,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /sbin/init - name: oraclelinux-7 image: oraclelinux:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -106,7 +107,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /usr/sbin/init - name: rhel-7 image: registry.access.redhat.com/ubi7:7.9 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -115,6 +116,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -123,6 +125,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -147,7 +150,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /usr/sbin/init - name: sles15 image: registry.suse.com/bci/bci-base:15.4 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -156,6 +159,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /usr/sbin/init - name: ubuntu-bionic image: ubuntu:bionic + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -164,6 +168,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /sbin/init - name: ubuntu-focal image: ubuntu:focal + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -172,6 +177,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/module/molecule.yml b/molecule/module/molecule.yml index 1d26ef401..f80a7e6fe 100644 --- a/molecule/module/molecule.yml +++ b/molecule/module/molecule.yml @@ -39,6 +39,7 @@ platforms: command: /sbin/init - name: alpine-3.16 image: alpine:3.16 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -47,6 +48,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -55,7 +57,7 @@ platforms: command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -64,7 +66,7 @@ platforms: command: /usr/sbin/init - name: centos-7 image: centos:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -81,7 +83,7 @@ platforms: command: /sbin/init - name: oraclelinux-7 image: oraclelinux:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -106,7 +108,7 @@ platforms: command: /usr/sbin/init - name: rhel-7 image: registry.access.redhat.com/ubi7:7.9 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -115,6 +117,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -123,6 +126,7 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -147,7 +151,7 @@ platforms: command: /usr/sbin/init - name: sles15 image: registry.suse.com/bci/bci-base:15.4 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -156,6 +160,7 @@ platforms: command: /usr/sbin/init - name: ubuntu-bionic image: ubuntu:bionic + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -164,6 +169,7 @@ platforms: command: /sbin/init - name: ubuntu-focal image: ubuntu:focal + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -172,6 +178,7 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/plus/molecule.yml b/molecule/plus/molecule.yml index 9c4fe54ef..1c8a25e77 100644 --- a/molecule/plus/molecule.yml +++ b/molecule/plus/molecule.yml @@ -47,6 +47,7 @@ platforms: command: /sbin/init - name: alpine-3.16 image: alpine:3.16 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -55,6 +56,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -63,7 +65,7 @@ platforms: command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -72,7 +74,7 @@ platforms: command: /usr/sbin/init - name: centos-7 image: centos:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -89,7 +91,7 @@ platforms: command: /sbin/init - name: oraclelinux-7 image: oraclelinux:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -114,7 +116,7 @@ platforms: command: /usr/sbin/init - name: rhel-7 image: registry.access.redhat.com/ubi7:7.9 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -123,6 +125,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -131,6 +134,7 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -155,7 +159,7 @@ platforms: command: /usr/sbin/init - name: sles15 image: registry.suse.com/bci/bci-base:15.4 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -164,6 +168,7 @@ platforms: command: /usr/sbin/init - name: ubuntu-bionic image: ubuntu:bionic + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -172,6 +177,7 @@ platforms: command: /sbin/init - name: ubuntu-focal image: ubuntu:focal + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -180,6 +186,7 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/source/molecule.yml b/molecule/source/molecule.yml index bac1e738a..fcb1fa47a 100644 --- a/molecule/source/molecule.yml +++ b/molecule/source/molecule.yml @@ -39,6 +39,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 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -47,6 +48,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions command: /sbin/init - name: alpine-3.17 image: alpine:3.17 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -55,7 +57,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: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -64,7 +66,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: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -95,25 +97,9 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - - name: rockylinux-8 - image: rockylinux:8 - dockerfile: ../common/Dockerfile.j2 - privileged: true - cgroupns_mode: host - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - command: /usr/sbin/init - - name: rockylinux-9 - image: rockylinux:9.0.20220720 - dockerfile: ../common/Dockerfile.j2 - privileged: true - cgroupns_mode: host - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - command: /usr/sbin/init - name: rhel-7 - image: registry.access.redhat.com/ubi7/ubi:7.9 - platform: amd64 + image: registry.access.redhat.com/ubi7:7.9 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -122,6 +108,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -130,6 +117,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -154,7 +142,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: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -163,6 +151,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions command: /usr/sbin/init - name: ubuntu-bionic image: ubuntu:bionic + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -171,6 +160,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions command: /sbin/init - name: ubuntu-focal image: ubuntu:focal + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -179,6 +169,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/uninstall/molecule.yml b/molecule/uninstall/molecule.yml index 4cc53e52c..1e4adb0db 100644 --- a/molecule/uninstall/molecule.yml +++ b/molecule/uninstall/molecule.yml @@ -39,6 +39,7 @@ platforms: command: /sbin/init - name: alpine-3.16 image: alpine:3.16 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -47,6 +48,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -55,7 +57,7 @@ platforms: command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -64,7 +66,7 @@ platforms: command: /usr/sbin/init - name: centos-7 image: centos:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -81,7 +83,7 @@ platforms: command: /sbin/init - name: oraclelinux-7 image: oraclelinux:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -105,8 +107,8 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-7 - image: registry.access.redhat.com/ubi7/ubi:7.9 - platform: amd64 + image: registry.access.redhat.com/ubi7:7.9 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -115,6 +117,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -123,6 +126,7 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -147,7 +151,7 @@ platforms: command: /usr/sbin/init - name: sles15 image: registry.suse.com/bci/bci-base:15.4 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -156,6 +160,7 @@ platforms: command: /usr/sbin/init - name: ubuntu-bionic image: ubuntu:bionic + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -164,6 +169,7 @@ platforms: command: /sbin/init - name: ubuntu-focal image: ubuntu:focal + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -172,6 +178,7 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/uninstall_plus/molecule.yml b/molecule/uninstall_plus/molecule.yml index 40c44d72f..c561118d5 100644 --- a/molecule/uninstall_plus/molecule.yml +++ b/molecule/uninstall_plus/molecule.yml @@ -47,6 +47,7 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c command: /sbin/init - name: alpine-3.16 image: alpine:3.16 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -55,6 +56,7 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c command: /sbin/init - name: alpine-3.17 image: alpine:3.17 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -63,7 +65,7 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -72,7 +74,7 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c command: /usr/sbin/init - name: centos-7 image: centos:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -89,7 +91,7 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c command: /sbin/init - name: oraclelinux-7 image: oraclelinux:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -113,8 +115,8 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: rhel-7 - image: registry.access.redhat.com/ubi7/ubi:7.9 - platform: amd64 + image: registry.access.redhat.com/ubi7:7.9 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -123,6 +125,7 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -131,6 +134,7 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -155,7 +159,7 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c command: /usr/sbin/init - name: sles15 image: registry.suse.com/bci/bci-base:15.4 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -164,6 +168,7 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -172,6 +177,7 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/upgrade/molecule.yml b/molecule/upgrade/molecule.yml index a79355918..1e4adb0db 100644 --- a/molecule/upgrade/molecule.yml +++ b/molecule/upgrade/molecule.yml @@ -39,6 +39,7 @@ platforms: command: /sbin/init - name: alpine-3.16 image: alpine:3.16 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -47,6 +48,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -55,7 +57,7 @@ platforms: command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -64,7 +66,7 @@ platforms: command: /usr/sbin/init - name: centos-7 image: centos:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -81,7 +83,7 @@ platforms: command: /sbin/init - name: oraclelinux-7 image: oraclelinux:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -106,7 +108,7 @@ platforms: command: /usr/sbin/init - name: rhel-7 image: registry.access.redhat.com/ubi7:7.9 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -115,6 +117,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -123,6 +126,7 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -147,7 +151,7 @@ platforms: command: /usr/sbin/init - name: sles15 image: registry.suse.com/bci/bci-base:15.4 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -156,6 +160,7 @@ platforms: command: /usr/sbin/init - name: ubuntu-bionic image: ubuntu:bionic + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -164,6 +169,7 @@ platforms: command: /sbin/init - name: ubuntu-focal image: ubuntu:focal + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -172,6 +178,7 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/upgrade_plus/molecule.yml b/molecule/upgrade_plus/molecule.yml index 51ba610e7..f03e04938 100644 --- a/molecule/upgrade_plus/molecule.yml +++ b/molecule/upgrade_plus/molecule.yml @@ -47,6 +47,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /sbin/init - name: alpine-3.16 image: alpine:3.16 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -55,7 +56,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -64,7 +65,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /usr/sbin/init - name: centos-7 image: centos:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -81,7 +82,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /sbin/init - name: oraclelinux-7 image: oraclelinux:7 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -106,7 +107,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /usr/sbin/init - name: rhel-7 image: registry.access.redhat.com/ubi7:7.9 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -115,6 +116,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -123,6 +125,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -147,7 +150,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /usr/sbin/init - name: sles15 image: registry.suse.com/bci/bci-base:15.4 - platform: amd64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -156,6 +159,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /usr/sbin/init - name: ubuntu-bionic image: ubuntu:bionic + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -164,6 +168,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /sbin/init - name: ubuntu-focal image: ubuntu:focal + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -172,6 +177,7 @@ platforms: # Alpine 3.17 only has one version of NGINX Plus available (at the mo command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/vars/main.yml b/vars/main.yml index 78af6b49b..bb052a0fc 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -33,7 +33,7 @@ nginx_default_signing_key_rsa_pub: https://nginx.org/keys/nginx_signing.rsa.pub nginx_default_repository_alpine: "@nginx http://nginx.org/packages/{{ (nginx_branch == 'mainline') | ternary('mainline/', '') }}alpine/v{{ ansible_facts['distribution_version'] | regex_search('^[0-9]+\\.[0-9]+') }}/main" nginx_default_repository_amazon: https://nginx.org/packages/{{ (nginx_branch == 'mainline') | ternary('mainline/', '') }}/amzn2/$releasever/$basearch nginx_default_repository_debian: - - deb [arch={{ (ansible_facts['architecture'] == 'aarch64') | ternary('arm64', 'amd64') }} signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/{{ (nginx_branch == 'mainline') | ternary('mainline/', '') }}{{ ansible_facts['distribution'] | lower }}/ {{ ansible_facts['distribution_release'] }} nginx + - deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/{{ (nginx_branch == 'mainline') | ternary('mainline/', '') }}{{ ansible_facts['distribution'] | lower }}/ {{ ansible_facts['distribution_release'] }} nginx - deb-src [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/{{ (nginx_branch == 'mainline') | ternary('mainline/', '') }}{{ ansible_facts['distribution'] | lower }}/ {{ ansible_facts['distribution_release'] }} nginx nginx_default_repository_redhat: https://nginx.org/packages/{{ (nginx_branch == 'mainline') | ternary('mainline/', '') }}{{ (ansible_facts['distribution'] == 'CentOS') | ternary('centos', 'rhel') }}/{{ ansible_facts['distribution_major_version'] }}/$basearch/ nginx_default_repository_suse: https://nginx.org/packages/{{ (nginx_branch == 'mainline') | ternary('mainline/', '') }}sles/{{ ansible_facts['distribution_major_version'] }} @@ -41,7 +41,7 @@ nginx_default_repository_suse: https://nginx.org/packages/{{ (nginx_branch == 'm # Default NGINX Plus repositories nginx_plus_default_repository_alpine: https://pkgs.nginx.com/plus/alpine/v{{ ansible_facts['distribution_version'] | regex_search('^[0-9]+\.[0-9]+') }}/main nginx_plus_default_repository_amazon: https://pkgs.nginx.com/plus/amzn{{ (ansible_facts['distribution_major_version'] is version('2', '==')) | ternary('2', '') }}/$releasever/$basearch -nginx_plus_default_repository_debian: deb [arch={{ (ansible_facts['architecture'] == 'aarch64') | ternary('arm64', 'amd64') }} signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://pkgs.nginx.com/plus/{{ ansible_facts['distribution'] | lower }} {{ ansible_facts['distribution_release'] }} nginx-plus +nginx_plus_default_repository_debian: deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://pkgs.nginx.com/plus/{{ ansible_facts['distribution'] | lower }} {{ ansible_facts['distribution_release'] }} nginx-plus nginx_plus_default_repository_freebsd: https://pkgs.nginx.com/plus/freebsd/${ABI}/latest nginx_plus_default_repository_redhat: https://pkgs.nginx.com/plus/{{ (ansible_facts['distribution'] == 'CentOS') | ternary('centos', 'rhel') }}/{{ (ansible_facts['distribution_version'] is version('7.4', '>=') and ansible_facts['distribution_version'] is version('8', '<')) | ternary('7.4', ansible_facts['distribution_major_version']) }}/$basearch/ nginx_plus_default_repository_suse: https://pkgs.nginx.com/plus/sles/{{ ansible_facts['distribution_major_version'] }}?ssl_clientcert=/etc/ssl/nginx/nginx-repo-bundle.crt&ssl_verify=peer From effef2d7ecf7f25d3e3f21cd79fea44643ada134 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 26 Jan 2023 16:43:13 +0100 Subject: [PATCH 02/14] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7605a775e..d622037e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,7 +41,7 @@ TESTS: * Update GitHub actions to run on Ubuntu 22.04 (and thus support `cgroups` v2). * Explicitly specify `x86_64`/`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 `aarch64`/`arm64` processors) when running tests in distributions that only support `x86_64` (either due to lack of support for a `cgroups` v2 backport or due to lack of builds for `aarch64`). -* Test some distributions using `aarch64` and `s390x` architectures. This should ensure the role works as intended across the various architectures that are officially supported. +* Explicitly test some distributions using `aarch64` and `s390x` as the Molecule platform. This should ensure the role works as intended across the various architectures that are officially supported. ## 0.23.2 (September 28, 2022) From b88bb98d10d920c7c83c13853f732216199a75a0 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 26 Jan 2023 19:08:11 +0100 Subject: [PATCH 03/14] Update molecule.yml --- .github/workflows/molecule.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 1711402fc..f920e3a0b 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -48,6 +48,11 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} run: pip3 install -r .github/workflows/requirements/requirements_molecule.txt + - name: Set up Docker QEMU + uses: docker/setup-qemu-action@v2 + with: + platforms: x86_64, aarch64, s390x + - name: Install Ansible core dependencies if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} run: ansible-galaxy install -r .github/workflows/requirements/requirements_ansible.yml From bcda1bb9b1d554674ec8ec5d65f5fa4ad4f78131 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 26 Jan 2023 19:10:26 +0100 Subject: [PATCH 04/14] Update molecule.yml --- .github/workflows/molecule.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index f920e3a0b..52bb9384c 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -49,6 +49,7 @@ jobs: run: pip3 install -r .github/workflows/requirements/requirements_molecule.txt - name: Set up Docker QEMU + if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: docker/setup-qemu-action@v2 with: platforms: x86_64, aarch64, s390x From 115ee77febea4a183fcd40ee73ed9af02e55532e Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 26 Jan 2023 19:13:06 +0100 Subject: [PATCH 05/14] Update molecule.yml --- .github/workflows/molecule.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 52bb9384c..ce25fd536 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -38,6 +38,12 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: actions/checkout@v3 + - name: Set up Docker QEMU + if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} + uses: docker/setup-qemu-action@v2 + with: + platforms: x86_64, aarch64, s390x + - name: Set up Python 3 if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: actions/setup-python@v4 @@ -48,12 +54,6 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} run: pip3 install -r .github/workflows/requirements/requirements_molecule.txt - - name: Set up Docker QEMU - if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} - uses: docker/setup-qemu-action@v2 - with: - platforms: x86_64, aarch64, s390x - - name: Install Ansible core dependencies if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} run: ansible-galaxy install -r .github/workflows/requirements/requirements_ansible.yml From 656ce7268dc001f7ee021a8b68b34516052733f2 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 26 Jan 2023 22:53:38 +0100 Subject: [PATCH 06/14] Update molecule.yml --- .github/workflows/molecule.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index ce25fd536..6d33c519c 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -42,7 +42,8 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: docker/setup-qemu-action@v2 with: - platforms: x86_64, aarch64, s390x + platforms: amd64, arm64, s390x + # platforms: x86_64, aarch64, s390x - name: Set up Python 3 if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} From 4267d62d03a179e1afecf3b439755cfdca9500ca Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 26 Jan 2023 22:57:26 +0100 Subject: [PATCH 07/14] Update molecule.yml --- .github/workflows/molecule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 6d33c519c..61641566e 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -42,7 +42,7 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: docker/setup-qemu-action@v2 with: - platforms: amd64, arm64, s390x + platforms: arm64, s390x # platforms: x86_64, aarch64, s390x - name: Set up Python 3 From 9626256fb46f4f8b407ee961291d0d2db32e0984 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 26 Jan 2023 22:59:14 +0100 Subject: [PATCH 08/14] Update molecule.yml --- .github/workflows/molecule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 61641566e..d25c759e6 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -42,7 +42,7 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: docker/setup-qemu-action@v2 with: - platforms: arm64, s390x + platforms: linux/arm64, linux/s390x # platforms: x86_64, aarch64, s390x - name: Set up Python 3 From 24bda48a1fd0354b5b4548436bba9246cceec59e Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 26 Jan 2023 23:05:41 +0100 Subject: [PATCH 09/14] Update molecule.yml --- .github/workflows/molecule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index d25c759e6..0b6bbe989 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -42,7 +42,7 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: docker/setup-qemu-action@v2 with: - platforms: linux/arm64, linux/s390x + platforms: linux/arm64,linux/s390x # platforms: x86_64, aarch64, s390x - name: Set up Python 3 From e08c4e9f110c8ff0cddf16a937d1126e3ecaf88a Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 26 Jan 2023 23:07:03 +0100 Subject: [PATCH 10/14] Update molecule.yml --- .github/workflows/molecule.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 0b6bbe989..e24118a44 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -42,7 +42,9 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: docker/setup-qemu-action@v2 with: - platforms: linux/arm64,linux/s390x + platforms: aarch64,s390x + + # platforms: linux/arm64,linux/s390x # platforms: x86_64, aarch64, s390x - name: Set up Python 3 From de1f63cd2d2c4a188cb8d52686c1d073a9bdf764 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 26 Jan 2023 23:07:59 +0100 Subject: [PATCH 11/14] Update molecule.yml --- .github/workflows/molecule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index e24118a44..6f5565049 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -42,7 +42,7 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: docker/setup-qemu-action@v2 with: - platforms: aarch64,s390x + platforms: x86_64,aarch64,s390x # platforms: linux/arm64,linux/s390x # platforms: x86_64, aarch64, s390x From 7bb7175924c30f2ae1bdd50fb738b6caacdb95ca Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 26 Jan 2023 23:08:51 +0100 Subject: [PATCH 12/14] Update molecule.yml --- .github/workflows/molecule.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 6f5565049..4488c0093 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -42,10 +42,7 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: docker/setup-qemu-action@v2 with: - platforms: x86_64,aarch64,s390x - - # platforms: linux/arm64,linux/s390x - # platforms: x86_64, aarch64, s390x + platforms: aarch64,s390x - name: Set up Python 3 if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} From e6ccc83a21b05591deea1d0c7ce152dce79a1e71 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 26 Jan 2023 23:34:40 +0100 Subject: [PATCH 13/14] Update main.yml --- defaults/main/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main/main.yml b/defaults/main/main.yml index a411d8fa6..c6cf706f1 100644 --- a/defaults/main/main.yml +++ b/defaults/main/main.yml @@ -68,7 +68,7 @@ nginx_static_modules: [http_ssl_module] # (Optional) Specify repository for NGINX Open Source or NGINX Plus. # Only works if 'install_from' is set to 'nginx_repository' when installing NGINX Open Source. # Defaults are the official NGINX repositories. -# nginx_repository: deb [arch=amd64] https://nginx.org/packages/mainline/debian/ buster nginx +# nginx_repository: deb https://nginx.org/packages/mainline/debian/ buster nginx # Specify which branch of NGINX Open Source you want to install. # Options are 'mainline' or 'stable'. From 81fcb4f929e00023e04fd7ee3aa65fdfb1f29c07 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Fri, 27 Jan 2023 03:09:42 +0100 Subject: [PATCH 14/14] Update install-modules.yml --- tasks/modules/install-modules.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasks/modules/install-modules.yml b/tasks/modules/install-modules.yml index bfe174dfa..2dc1c736b 100644 --- a/tasks/modules/install-modules.yml +++ b/tasks/modules/install-modules.yml @@ -63,5 +63,7 @@ or (ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version('8', '>='))) - not (item.name | default(item) == "geoip2") or not (ansible_facts['os_family'] == "Suse") + - not (item.name | default(item) == "lua") + or not (ansible_facts['architecture'] == "s390x") - not (item.name | default(item) == "opentracing") or not (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '=='))