Skip to content

chore: Remove commented out Molecule platforms #741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 19, 2024
Merged

chore: Remove commented out Molecule platforms #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 0 additions & 5 deletions molecule/agent/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions molecule/amplify/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 0 additions & 5 deletions molecule/default/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 0 additions & 5 deletions molecule/distribution/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 0 additions & 5 deletions molecule/downgrade-plus/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 0 additions & 5 deletions molecule/downgrade/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 0 additions & 5 deletions molecule/plus/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 0 additions & 5 deletions molecule/source-version/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 0 additions & 5 deletions molecule/source/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 0 additions & 5 deletions molecule/stable/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading