From bdd553c30d78ad621b31e562e39e43a25c5a96c6 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Tue, 16 Jul 2024 01:53:14 +0200 Subject: [PATCH 1/3] ci: Reimplement testing different architectures --- .github/workflows/molecule.yml | 8 ++++++++ CHANGELOG.md | 1 + molecule/default/molecule.yml | 10 +++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 1fc6a3812..27281e8af 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -69,6 +69,14 @@ jobs: if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - name: Set up QEMU + if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} + uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0 + + - name: Set up Docker Buildx + if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} + uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0 + # - name: Set up Docker QEMU # if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} # uses: docker/setup-qemu-action@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 85af3d6b1..da9bbd098 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. +- Test `aarch64` and `s390x` architectures in addition to `x86_64`. ## 0.24.3 (July 11, 2024) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index ecdf06cd1..be0a7f536 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -20,7 +20,7 @@ platforms: command: /usr/sbin/init - name: alpine-3.17 image: alpine:3.17 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -102,7 +102,7 @@ platforms: command: /usr/sbin/init - name: rhel-8 image: redhat/ubi8:8.9 - # platform: s390x + platform: s390x dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -111,7 +111,7 @@ platforms: command: /usr/sbin/init - name: rhel-9 image: redhat/ubi9:9.3 - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host @@ -145,7 +145,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 @@ -154,7 +154,7 @@ platforms: command: /sbin/init - name: ubuntu-jammy image: ubuntu:jammy - # platform: aarch64 + platform: aarch64 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host From 747edadcc23a828dbae5f09d774b2ed4855ad3fc Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Tue, 16 Jul 2024 02:26:39 +0200 Subject: [PATCH 2/3] fix: Try running <20 platforms --- molecule/default/molecule.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index be0a7f536..257c1d0c8 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -161,22 +161,22 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init - - name: ubuntu-mantic - image: ubuntu:mantic - dockerfile: ../common/Dockerfile.j2 - privileged: true - cgroupns_mode: host - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - command: /sbin/init - - name: ubuntu-noble - image: ubuntu:noble - dockerfile: ../common/Dockerfile.j2 - privileged: true - cgroupns_mode: host - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - command: /sbin/init + # - name: ubuntu-mantic + # image: ubuntu:mantic + # dockerfile: ../common/Dockerfile.j2 + # privileged: true + # cgroupns_mode: host + # volumes: + # - /sys/fs/cgroup:/sys/fs/cgroup:rw + # command: /sbin/init + # - name: ubuntu-noble + # image: ubuntu:noble + # 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 From b153e3ed4463b41fe2d5829093ab30b11c12a244 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Tue, 16 Jul 2024 12:05:02 +0200 Subject: [PATCH 3/3] fix: Pin Docker buildx version --- .github/workflows/molecule.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 27281e8af..e3d082ef8 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -76,6 +76,8 @@ jobs: - name: Set up Docker Buildx if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }} uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0 + with: + version: v0.12.0 # - name: Set up Docker QEMU # if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}