diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 71dae13ca..602b460fd 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -63,11 +63,11 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: actions/checkout@v4 - # - 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@v3 + 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 4ef787321..0df9238ed 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 @@ -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 @@ -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 @@ -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,21 +174,21 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy - # platform: aarch64 - 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 + platform: aarch64 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 diff --git a/molecule/distribution/molecule.yml b/molecule/distribution/molecule.yml index 9436c4382..b8c4c0f31 100644 --- a/molecule/distribution/molecule.yml +++ b/molecule/distribution/molecule.yml @@ -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 @@ -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 @@ -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 03acde923..139e2db95 100644 --- a/molecule/downgrade-plus/molecule.yml +++ b/molecule/downgrade-plus/molecule.yml @@ -37,21 +37,21 @@ 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 + 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 @@ -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 @@ -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 45cd5fddc..40d9747da 100644 --- a/molecule/downgrade/molecule.yml +++ b/molecule/downgrade/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 @@ -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 @@ -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/plus/molecule.yml b/molecule/plus/molecule.yml index c44d74f45..1cabdb975 100644 --- a/molecule/plus/molecule.yml +++ b/molecule/plus/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 @@ -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 @@ -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 683e7668d..e79780ffd 100644 --- a/molecule/source/molecule.yml +++ b/molecule/source/molecule.yml @@ -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 @@ -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 @@ -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 diff --git a/molecule/stable/molecule.yml b/molecule/stable/molecule.yml index 4ef787321..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 @@ -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 @@ -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/uninstall-plus/molecule.yml b/molecule/uninstall-plus/molecule.yml index 450d18c7e..6931d5adc 100644 --- a/molecule/uninstall-plus/molecule.yml +++ b/molecule/uninstall-plus/molecule.yml @@ -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 @@ -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 @@ -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 45cd5fddc..40d9747da 100644 --- a/molecule/uninstall/molecule.yml +++ b/molecule/uninstall/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 @@ -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 @@ -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/upgrade-plus/molecule.yml b/molecule/upgrade-plus/molecule.yml index 03acde923..1dac222cf 100644 --- a/molecule/upgrade-plus/molecule.yml +++ b/molecule/upgrade-plus/molecule.yml @@ -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 @@ -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 @@ -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 @@ -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 45cd5fddc..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 @@ -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 @@ -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/version/molecule.yml b/molecule/version/molecule.yml index 4ef787321..1419066fd 100644 --- a/molecule/version/molecule.yml +++ b/molecule/version/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 @@ -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 @@ -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