From 25f4b927237826667766e59cfba63914e14497f4 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Tue, 5 Sep 2023 14:41:02 -0700 Subject: [PATCH 01/15] Try to reimplement testing different architectures --- .github/workflows/molecule.yml | 10 +++++----- molecule/default/molecule.yml | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 3c422e422..36b635e1d 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -62,11 +62,11 @@ 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: aarch64,s390x + - 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: aarch64,s390x - name: Set up Python 3 if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index f0c65a5f3..e7dce18e2 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -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 @@ -37,7 +37,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -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 @@ -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 @@ -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 @@ -122,7 +122,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 - # # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -131,7 +131,7 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -165,7 +165,7 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -174,7 +174,7 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -183,7 +183,7 @@ platforms: command: /sbin/init - name: ubuntu-kinetic image: ubuntu:kinetic - # platform: x86_64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host From 477810961c217c3707c0666755d5c8ce0e37e299 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Tue, 5 Sep 2023 15:37:38 -0700 Subject: [PATCH 02/15] changes --- molecule/distribution/molecule.yml | 18 +++++++++--------- molecule/downgrade-plus/molecule.yml | 22 +++++++++++----------- molecule/downgrade/molecule.yml | 24 ++++++++++++------------ molecule/plus/molecule.yml | 22 +++++++++++----------- molecule/source/molecule.yml | 22 +++++++++++----------- molecule/stable/molecule.yml | 22 +++++++++++----------- molecule/uninstall-plus/molecule.yml | 24 ++++++++++++------------ molecule/uninstall/molecule.yml | 24 ++++++++++++------------ molecule/upgrade-plus/molecule.yml | 22 +++++++++++----------- molecule/upgrade/molecule.yml | 14 +++++++------- molecule/version/molecule.yml | 24 ++++++++++++------------ 11 files changed, 119 insertions(+), 119 deletions(-) diff --git a/molecule/distribution/molecule.yml b/molecule/distribution/molecule.yml index c4cfb7a48..ecebd834d 100644 --- a/molecule/distribution/molecule.yml +++ b/molecule/distribution/molecule.yml @@ -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 @@ -37,7 +37,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -122,7 +122,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when # command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -131,7 +131,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -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 @@ -174,7 +174,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when command: /sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -183,7 +183,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy - # platform: aarch64 + 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 6d49bb49f..22d9aeba5 100644 --- a/molecule/downgrade-plus/molecule.yml +++ b/molecule/downgrade-plus/molecule.yml @@ -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 @@ -37,7 +37,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -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 @@ -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 @@ -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 @@ -122,7 +122,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -131,7 +131,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -165,7 +165,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -174,7 +174,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/downgrade/molecule.yml b/molecule/downgrade/molecule.yml index b1a311b29..488acdb52 100644 --- a/molecule/downgrade/molecule.yml +++ b/molecule/downgrade/molecule.yml @@ -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 @@ -37,7 +37,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -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 @@ -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 @@ -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 @@ -122,7 +122,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -131,7 +131,7 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -165,7 +165,7 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -174,7 +174,7 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -183,7 +183,7 @@ platforms: command: /sbin/init - name: ubuntu-kinetic image: ubuntu:kinetic - # platform: x86_64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/plus/molecule.yml b/molecule/plus/molecule.yml index d217b259e..1cabdb975 100644 --- a/molecule/plus/molecule.yml +++ b/molecule/plus/molecule.yml @@ -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 @@ -37,7 +37,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -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 @@ -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 @@ -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 @@ -122,7 +122,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -131,7 +131,7 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -165,7 +165,7 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -174,7 +174,7 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/source/molecule.yml b/molecule/source/molecule.yml index 0188637e3..6235d8650 100644 --- a/molecule/source/molecule.yml +++ b/molecule/source/molecule.yml @@ -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 @@ -37,7 +37,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 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -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 @@ -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 @@ -113,7 +113,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 + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -122,7 +122,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 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -156,7 +156,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -165,7 +165,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 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -174,7 +174,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions command: /sbin/init - name: ubuntu-kinetic image: ubuntu:kinetic - # platform: x86_64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/stable/molecule.yml b/molecule/stable/molecule.yml index f5b1de504..1ad015c09 100644 --- a/molecule/stable/molecule.yml +++ b/molecule/stable/molecule.yml @@ -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 @@ -37,7 +37,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # # platform: aarch64 + # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -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 @@ -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 @@ -122,7 +122,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 - # # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -131,7 +131,7 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 - # # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -165,7 +165,7 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -174,7 +174,7 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy - # # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -183,7 +183,7 @@ platforms: command: /sbin/init - name: ubuntu-kinetic image: ubuntu:kinetic - # platform: x86_64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/uninstall-plus/molecule.yml b/molecule/uninstall-plus/molecule.yml index e57adef47..6931d5adc 100644 --- a/molecule/uninstall-plus/molecule.yml +++ b/molecule/uninstall-plus/molecule.yml @@ -28,7 +28,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 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -37,7 +37,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 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -46,7 +46,7 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c command: /sbin/init - name: alpine-3.18 image: alpine:3.18 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -55,7 +55,7 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 - # platform: x86_64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -64,7 +64,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: x86_64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -89,7 +89,7 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c command: /sbin/init - name: oraclelinux-7 image: oraclelinux:7 - # platform: x86_64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -114,7 +114,7 @@ platforms: # Ubuntu bionic results in a segmentation fault error as of Ansible c 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 @@ -123,7 +123,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 + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -132,7 +132,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 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -157,7 +157,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: x86_64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -166,7 +166,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 + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -175,7 +175,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 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/uninstall/molecule.yml b/molecule/uninstall/molecule.yml index b1a311b29..488acdb52 100644 --- a/molecule/uninstall/molecule.yml +++ b/molecule/uninstall/molecule.yml @@ -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 @@ -37,7 +37,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -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 @@ -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 @@ -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 @@ -122,7 +122,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -131,7 +131,7 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -165,7 +165,7 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -174,7 +174,7 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -183,7 +183,7 @@ platforms: command: /sbin/init - name: ubuntu-kinetic image: ubuntu:kinetic - # platform: x86_64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/upgrade-plus/molecule.yml b/molecule/upgrade-plus/molecule.yml index 6d49bb49f..22d9aeba5 100644 --- a/molecule/upgrade-plus/molecule.yml +++ b/molecule/upgrade-plus/molecule.yml @@ -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 @@ -37,7 +37,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -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 @@ -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 @@ -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 @@ -122,7 +122,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -131,7 +131,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -165,7 +165,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -174,7 +174,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/upgrade/molecule.yml b/molecule/upgrade/molecule.yml index b1a311b29..24b90a951 100644 --- a/molecule/upgrade/molecule.yml +++ b/molecule/upgrade/molecule.yml @@ -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 @@ -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 @@ -122,7 +122,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -165,7 +165,7 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -174,7 +174,7 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -183,7 +183,7 @@ platforms: command: /sbin/init - name: ubuntu-kinetic image: ubuntu:kinetic - # platform: x86_64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/version/molecule.yml b/molecule/version/molecule.yml index 66e0c29c3..e7dce18e2 100644 --- a/molecule/version/molecule.yml +++ b/molecule/version/molecule.yml @@ -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 @@ -37,7 +37,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -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 @@ -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 @@ -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 @@ -122,7 +122,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 - # # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -131,7 +131,7 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 - # # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -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 @@ -165,7 +165,7 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -174,7 +174,7 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy - # # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -183,7 +183,7 @@ platforms: command: /sbin/init - name: ubuntu-kinetic image: ubuntu:kinetic - # # platform: x86_64 + platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host From 08bcefcc5542c5b7303e42e4e7c5c4d9758a61cd Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 7 Sep 2023 18:29:50 +0200 Subject: [PATCH 03/15] Update molecule.yml --- molecule/default/molecule.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index e7dce18e2..d8986f901 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -122,7 +122,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 - platform: s390x + # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -165,7 +165,7 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - platform: s390x + # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host From 1399574c58a0b293d8a93c37c30ebe710824b739 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 7 Sep 2023 19:29:09 +0200 Subject: [PATCH 04/15] 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 36b635e1d..f3ca7f3e7 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -66,7 +66,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: aarch64 - name: Set up Python 3 if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} From 683532ef04d515270529005b868252bd506db383 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Fri, 8 Sep 2023 15:42:57 +0200 Subject: [PATCH 05/15] 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 f3ca7f3e7..3087798de 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -66,7 +66,7 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: docker/setup-qemu-action@v2 with: - platforms: aarch64 + platforms: arm64 - name: Set up Python 3 if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} From 053812aac4e6ed1b90a2d1bb967026d10bd01df6 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Fri, 8 Sep 2023 16:31:21 +0200 Subject: [PATCH 06/15] Update molecule.yml --- molecule/default/molecule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index d8986f901..54f07d216 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -37,7 +37,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - platform: aarch64 + platform: linux/arm64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host From 47fed2c202b0ba0a22c68e31eaa42589f72cdb4c Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Fri, 8 Sep 2023 17:27:13 +0200 Subject: [PATCH 07/15] Update molecule.yml --- .github/workflows/molecule.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 3087798de..f2190f97d 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -68,6 +68,9 @@ jobs: with: platforms: arm64 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Set up Python 3 if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: actions/setup-python@v4 From 1cb8383b9676197500d94e54b7f09acb60bedb78 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Fri, 8 Sep 2023 19:29:06 +0200 Subject: [PATCH 08/15] test --- .github/workflows/molecule.yml | 5 +---- molecule/default/molecule.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index f2190f97d..947bc2249 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -66,10 +66,7 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: docker/setup-qemu-action@v2 with: - platforms: arm64 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + platforms: aarch64, s390x - name: Set up Python 3 if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 54f07d216..537621b97 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -35,15 +35,15 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init - - name: alpine-3.17 - image: alpine:3.17 - platform: linux/arm64 - dockerfile: ../common/Dockerfile.j2 - privileged: true - cgroupns_mode: host - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - command: /sbin/init + # - name: alpine-3.17 + # image: alpine:3.17 + # platform: aarch64 + # dockerfile: ../common/Dockerfile.j2 + # privileged: true + # cgroupns_mode: host + # volumes: + # - /sys/fs/cgroup:/sys/fs/cgroup:rw + # command: /sbin/init - name: alpine-3.18 image: alpine:3.18 dockerfile: ../common/Dockerfile.j2 From 8a90aa82c079ad8107f56d42a2cd4253b0cf0ac3 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Fri, 8 Sep 2023 20:40:20 +0200 Subject: [PATCH 09/15] Update molecule.yml --- molecule/default/molecule.yml | 52 +++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 537621b97..1ae868315 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -18,23 +18,23 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - - name: alpine-3.15 - image: alpine:3.15 - dockerfile: ../common/Dockerfile.j2 - privileged: true - cgroupns_mode: host - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - command: /sbin/init - - name: alpine-3.16 - image: alpine:3.16 - platform: x86_64 - dockerfile: ../common/Dockerfile.j2 - privileged: true - cgroupns_mode: host - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - command: /sbin/init + # - name: alpine-3.15 + # image: alpine:3.15 + # dockerfile: ../common/Dockerfile.j2 + # privileged: true + # cgroupns_mode: host + # volumes: + # - /sys/fs/cgroup:/sys/fs/cgroup:rw + # command: /sbin/init + # - name: alpine-3.16 + # image: alpine:3.16 + # platform: x86_64 + # dockerfile: ../common/Dockerfile.j2 + # privileged: true + # cgroupns_mode: host + # volumes: + # - /sys/fs/cgroup:/sys/fs/cgroup:rw + # command: /sbin/init # - name: alpine-3.17 # image: alpine:3.17 # platform: aarch64 @@ -52,15 +52,15 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init - - name: amazonlinux-2 - image: amazonlinux:2 - platform: x86_64 - dockerfile: ../common/Dockerfile.j2 - privileged: true - cgroupns_mode: host - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - command: /usr/sbin/init + # - name: amazonlinux-2 + # image: amazonlinux:2 + # platform: x86_64 + # dockerfile: ../common/Dockerfile.j2 + # privileged: true + # cgroupns_mode: host + # volumes: + # - /sys/fs/cgroup:/sys/fs/cgroup:rw + # command: /usr/sbin/init - name: centos-7 image: centos:7 platform: x86_64 From b1d927b8095bd78d8810d8650be06113c0bf01b0 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Fri, 22 Sep 2023 13:06:48 +0200 Subject: [PATCH 10/15] Update Docker Qemu --- .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 812131c68..6fef5f330 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -64,7 +64,7 @@ jobs: - name: Set up Docker QEMU if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: platforms: aarch64, s390x From bf8182e5e120aa0cf4b4d33df0fe9f185f189edf Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Fri, 22 Sep 2023 14:41:49 +0200 Subject: [PATCH 11/15] 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 6fef5f330..fa501b876 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -66,7 +66,7 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: docker/setup-qemu-action@v3 with: - platforms: aarch64, s390x + platforms: aarch64,s390x - name: Set up Python 3 if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} From 873854bbe4502ced0c97814b5fee8fec3c5093fc Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Fri, 22 Sep 2023 17:01:42 +0200 Subject: [PATCH 12/15] uncomment all the things --- molecule/default/molecule.yml | 6 +++--- molecule/stable/molecule.yml | 2 +- molecule/upgrade/molecule.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 950d39697..1419066fd 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -37,7 +37,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -122,7 +122,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.7 - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -165,7 +165,7 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/stable/molecule.yml b/molecule/stable/molecule.yml index bf5a66cae..1419066fd 100644 --- a/molecule/stable/molecule.yml +++ b/molecule/stable/molecule.yml @@ -37,7 +37,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/upgrade/molecule.yml b/molecule/upgrade/molecule.yml index febb2a13f..40d9747da 100644 --- a/molecule/upgrade/molecule.yml +++ b/molecule/upgrade/molecule.yml @@ -37,7 +37,7 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -131,7 +131,7 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.1.0 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host From cb7838ec07622db33b2b284063bd6ab15d031431 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Mon, 25 Sep 2023 15:58:09 +0200 Subject: [PATCH 13/15] tests --- molecule/default/molecule.yml | 32 ++++++++++++++-------------- molecule/downgrade-plus/molecule.yml | 16 +++++++------- molecule/upgrade-plus/molecule.yml | 16 +++++++------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 1419066fd..067fdfe58 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -2,22 +2,22 @@ driver: name: docker platforms: - - name: almalinux-8 - image: almalinux:8 - dockerfile: ../common/Dockerfile.j2 - privileged: true - cgroupns_mode: host - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - command: /usr/sbin/init - - name: almalinux-9 - image: almalinux:9 - dockerfile: ../common/Dockerfile.j2 - privileged: true - cgroupns_mode: host - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - command: /usr/sbin/init + # - name: almalinux-8 + # image: almalinux:8 + # dockerfile: ../common/Dockerfile.j2 + # privileged: true + # cgroupns_mode: host + # volumes: + # - /sys/fs/cgroup:/sys/fs/cgroup:rw + # command: /usr/sbin/init + # - name: almalinux-9 + # image: almalinux:9 + # dockerfile: ../common/Dockerfile.j2 + # privileged: true + # cgroupns_mode: host + # volumes: + # - /sys/fs/cgroup:/sys/fs/cgroup:rw + # command: /usr/sbin/init - name: alpine-3.15 image: alpine:3.15 dockerfile: ../common/Dockerfile.j2 diff --git a/molecule/downgrade-plus/molecule.yml b/molecule/downgrade-plus/molecule.yml index 22d9aeba5..139e2db95 100644 --- a/molecule/downgrade-plus/molecule.yml +++ b/molecule/downgrade-plus/molecule.yml @@ -44,14 +44,14 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init - # - name: alpine-3.18 - # image: alpine:3.18 - # dockerfile: ../common/Dockerfile.j2 - # privileged: true - # cgroupns_mode: host - # volumes: - # - /sys/fs/cgroup:/sys/fs/cgroup:rw - # command: /sbin/init + - name: alpine-3.18 + image: alpine:3.18 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 platform: x86_64 diff --git a/molecule/upgrade-plus/molecule.yml b/molecule/upgrade-plus/molecule.yml index 22d9aeba5..1dac222cf 100644 --- a/molecule/upgrade-plus/molecule.yml +++ b/molecule/upgrade-plus/molecule.yml @@ -78,14 +78,14 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init - # - name: debian-bookworm - # image: debian:bookworm-slim - # dockerfile: ../common/Dockerfile.j2 - # privileged: true - # cgroupns_mode: host - # volumes: - # - /sys/fs/cgroup:/sys/fs/cgroup:rw - # command: /sbin/init + - name: debian-bookworm + image: debian:bookworm-slim + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: oraclelinux-7 image: oraclelinux:7 platform: x86_64 From e89bb58624b38b7e1121dab3d62468463e3770d8 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Tue, 26 Sep 2023 16:48:26 +0200 Subject: [PATCH 14/15] Update molecule.yml --- molecule/default/molecule.yml | 48 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 067fdfe58..0229e7a88 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -2,22 +2,22 @@ driver: name: docker platforms: - # - name: almalinux-8 - # image: almalinux:8 - # dockerfile: ../common/Dockerfile.j2 - # privileged: true - # cgroupns_mode: host - # volumes: - # - /sys/fs/cgroup:/sys/fs/cgroup:rw - # command: /usr/sbin/init - # - name: almalinux-9 - # image: almalinux:9 - # dockerfile: ../common/Dockerfile.j2 - # privileged: true - # cgroupns_mode: host - # volumes: - # - /sys/fs/cgroup:/sys/fs/cgroup:rw - # command: /usr/sbin/init + - name: almalinux-8 + image: almalinux:8 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /usr/sbin/init + - name: almalinux-9 + image: almalinux:9 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /usr/sbin/init - name: alpine-3.15 image: alpine:3.15 dockerfile: ../common/Dockerfile.j2 @@ -78,14 +78,14 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init - - name: debian-bookworm - image: debian:bookworm-slim - dockerfile: ../common/Dockerfile.j2 - privileged: true - cgroupns_mode: host - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - command: /sbin/init + # - name: debian-bookworm + # image: debian:bookworm-slim + # dockerfile: ../common/Dockerfile.j2 + # privileged: true + # cgroupns_mode: host + # volumes: + # - /sys/fs/cgroup:/sys/fs/cgroup:rw + # command: /sbin/init - name: oraclelinux-7 image: oraclelinux:7 platform: x86_64 From a298474835504374445ebf6281b67c691f12ec5e Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Tue, 26 Sep 2023 18:47:39 +0200 Subject: [PATCH 15/15] Update molecule.yml --- molecule/default/molecule.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 0229e7a88..0df9238ed 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -181,14 +181,14 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init - - name: ubuntu-lunar - image: ubuntu:lunar - dockerfile: ../common/Dockerfile.j2 - privileged: true - cgroupns_mode: host - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - command: /sbin/init + # - name: ubuntu-lunar + # image: ubuntu:lunar + # dockerfile: ../common/Dockerfile.j2 + # privileged: true + # cgroupns_mode: host + # volumes: + # - /sys/fs/cgroup:/sys/fs/cgroup:rw + # command: /sbin/init provisioner: name: ansible log: true