diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 1fc6a3812..a1469ff30 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -69,12 +69,6 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - # - 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) }} uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 85af3d6b1..d6d9f9e88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ CI/CD: - Update GitHub Actions to Ubuntu 24.04. - Switch GitHub Actions from using tags to release hashes. +- Remove commented out Molecule platforms and GitHub Actions QEMU step for the time being. These changes will be reverted if multi-arch testing can be reinstated in GitHub Actions. ## 0.24.3 (July 11, 2024) diff --git a/molecule/agent/molecule.yml b/molecule/agent/molecule.yml index 4f0800304..1aa45c733 100644 --- a/molecule/agent/molecule.yml +++ b/molecule/agent/molecule.yml @@ -20,7 +20,6 @@ platforms: command: /usr/sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -102,7 +101,6 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.9 - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -111,7 +109,6 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -145,7 +142,6 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -154,7 +150,6 @@ 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/amplify/molecule.yml b/molecule/amplify/molecule.yml index df5f6bf7f..947c389fa 100644 --- a/molecule/amplify/molecule.yml +++ b/molecule/amplify/molecule.yml @@ -29,7 +29,6 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -38,7 +37,6 @@ platforms: command: /usr/sbin/init - name: ubuntu-jammy image: ubuntu:jammy - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index ecdf06cd1..3df98f218 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -20,7 +20,6 @@ platforms: command: /usr/sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -102,7 +101,6 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.9 - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -111,7 +109,6 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -145,7 +142,6 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -154,7 +150,6 @@ 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/distribution/molecule.yml b/molecule/distribution/molecule.yml index ecdf06cd1..3df98f218 100644 --- a/molecule/distribution/molecule.yml +++ b/molecule/distribution/molecule.yml @@ -20,7 +20,6 @@ platforms: command: /usr/sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -102,7 +101,6 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.9 - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -111,7 +109,6 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -145,7 +142,6 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -154,7 +150,6 @@ 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 0f52de2c5..c242f58a4 100644 --- a/molecule/downgrade-plus/molecule.yml +++ b/molecule/downgrade-plus/molecule.yml @@ -29,7 +29,6 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -103,7 +102,6 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.9 - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -112,7 +110,6 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -146,7 +143,6 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -155,7 +151,6 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m 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 ad87cfed9..0977799db 100644 --- a/molecule/downgrade/molecule.yml +++ b/molecule/downgrade/molecule.yml @@ -20,7 +20,6 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom command: /usr/sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -102,7 +101,6 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.9 - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -111,7 +109,6 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -145,7 +142,6 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -154,7 +150,6 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom 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 75164478e..b1ff6072d 100644 --- a/molecule/plus/molecule.yml +++ b/molecule/plus/molecule.yml @@ -29,7 +29,6 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -103,7 +102,6 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.9 - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -112,7 +110,6 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -146,7 +143,6 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -155,7 +151,6 @@ 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-version/molecule.yml b/molecule/source-version/molecule.yml index 2ad15b9ad..22adec169 100644 --- a/molecule/source-version/molecule.yml +++ b/molecule/source-version/molecule.yml @@ -20,7 +20,6 @@ platforms: command: /usr/sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -102,7 +101,6 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.9 - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -111,7 +109,6 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -145,7 +142,6 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -154,7 +150,6 @@ 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 ecdf06cd1..3df98f218 100644 --- a/molecule/source/molecule.yml +++ b/molecule/source/molecule.yml @@ -20,7 +20,6 @@ platforms: command: /usr/sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -102,7 +101,6 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.9 - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -111,7 +109,6 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -145,7 +142,6 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -154,7 +150,6 @@ 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/stable/molecule.yml b/molecule/stable/molecule.yml index ecdf06cd1..3df98f218 100644 --- a/molecule/stable/molecule.yml +++ b/molecule/stable/molecule.yml @@ -20,7 +20,6 @@ platforms: command: /usr/sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -102,7 +101,6 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.9 - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -111,7 +109,6 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -145,7 +142,6 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -154,7 +150,6 @@ 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 75164478e..b1ff6072d 100644 --- a/molecule/uninstall-plus/molecule.yml +++ b/molecule/uninstall-plus/molecule.yml @@ -29,7 +29,6 @@ platforms: command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -103,7 +102,6 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.9 - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -112,7 +110,6 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -146,7 +143,6 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -155,7 +151,6 @@ 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/molecule.yml b/molecule/uninstall/molecule.yml index 69ba5c6d8..d41740c06 100644 --- a/molecule/uninstall/molecule.yml +++ b/molecule/uninstall/molecule.yml @@ -20,7 +20,6 @@ platforms: command: /usr/sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -102,7 +101,6 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.9 - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -111,7 +109,6 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -145,7 +142,6 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -154,7 +150,6 @@ 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 defda0d20..b31d080f1 100644 --- a/molecule/upgrade-plus/molecule.yml +++ b/molecule/upgrade-plus/molecule.yml @@ -29,7 +29,6 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m command: /sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -103,7 +102,6 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.9 - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -112,7 +110,6 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -146,7 +143,6 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -155,7 +151,6 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m 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 f02658884..8519a9226 100644 --- a/molecule/upgrade/molecule.yml +++ b/molecule/upgrade/molecule.yml @@ -20,7 +20,6 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom command: /usr/sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -102,7 +101,6 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.9 - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -111,7 +109,6 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -145,7 +142,6 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -154,7 +150,6 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/version/molecule.yml b/molecule/version/molecule.yml index 2ad15b9ad..22adec169 100644 --- a/molecule/version/molecule.yml +++ b/molecule/version/molecule.yml @@ -20,7 +20,6 @@ platforms: command: /usr/sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -102,7 +101,6 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.9 - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -111,7 +109,6 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -145,7 +142,6 @@ platforms: command: /usr/sbin/init - name: ubuntu-focal image: ubuntu:focal - # platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -154,7 +150,6 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy - # platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host