Skip to content

Commit d408a47

Browse files
alessfgalessfg
authored
chore: Remove commented out Molecule platforms (#741)
1 parent d5a9701 commit d408a47

File tree

17 files changed

+1
-78
lines changed

17 files changed

+1
-78
lines changed

‎.github/workflows/molecule.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ jobs:
6969
if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
7070
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
7171

72-
# - name: Set up Docker QEMU
73-
# if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
74-
# uses: docker/setup-qemu-action@v2
75-
# with:
76-
# platforms: aarch64,s390x
77-
7872
- name: Set up Python 3
7973
if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
8074
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ CI/CD:
1515

1616
- Update GitHub Actions to Ubuntu 24.04.
1717
- Switch GitHub Actions from using tags to release hashes.
18+
- 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.
1819

1920
## 0.24.3 (July 11, 2024)
2021

‎molecule/agent/molecule.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ platforms:
2020
command: /usr/sbin/init
2121
- name: alpine-3.17
2222
image: alpine:3.17
23-
# platform: aarch64
2423
dockerfile: ../common/Dockerfile.j2
2524
privileged: true
2625
cgroupns_mode: host
@@ -102,7 +101,6 @@ platforms:
102101
command: /usr/sbin/init
103102
- name: rhel-8
104103
image: redhat/ubi8:8.9
105-
# platform: s390x
106104
dockerfile: ../common/Dockerfile.j2
107105
privileged: true
108106
cgroupns_mode: host
@@ -111,7 +109,6 @@ platforms:
111109
command: /usr/sbin/init
112110
- name: rhel-9
113111
image: redhat/ubi9:9.3
114-
# platform: aarch64
115112
dockerfile: ../common/Dockerfile.j2
116113
privileged: true
117114
cgroupns_mode: host
@@ -145,7 +142,6 @@ platforms:
145142
command: /usr/sbin/init
146143
- name: ubuntu-focal
147144
image: ubuntu:focal
148-
# platform: s390x
149145
dockerfile: ../common/Dockerfile.j2
150146
privileged: true
151147
cgroupns_mode: host
@@ -154,7 +150,6 @@ platforms:
154150
command: /sbin/init
155151
- name: ubuntu-jammy
156152
image: ubuntu:jammy
157-
# platform: aarch64
158153
dockerfile: ../common/Dockerfile.j2
159154
privileged: true
160155
cgroupns_mode: host

‎molecule/amplify/molecule.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ platforms:
2929
command: /usr/sbin/init
3030
- name: rhel-9
3131
image: redhat/ubi9:9.3
32-
# platform: aarch64
3332
dockerfile: ../common/Dockerfile.j2
3433
privileged: true
3534
cgroupns_mode: host
@@ -38,7 +37,6 @@ platforms:
3837
command: /usr/sbin/init
3938
- name: ubuntu-jammy
4039
image: ubuntu:jammy
41-
# platform: aarch64
4240
dockerfile: ../common/Dockerfile.j2
4341
privileged: true
4442
cgroupns_mode: host

‎molecule/default/molecule.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ platforms:
2020
command: /usr/sbin/init
2121
- name: alpine-3.17
2222
image: alpine:3.17
23-
# platform: aarch64
2423
dockerfile: ../common/Dockerfile.j2
2524
privileged: true
2625
cgroupns_mode: host
@@ -102,7 +101,6 @@ platforms:
102101
command: /usr/sbin/init
103102
- name: rhel-8
104103
image: redhat/ubi8:8.9
105-
# platform: s390x
106104
dockerfile: ../common/Dockerfile.j2
107105
privileged: true
108106
cgroupns_mode: host
@@ -111,7 +109,6 @@ platforms:
111109
command: /usr/sbin/init
112110
- name: rhel-9
113111
image: redhat/ubi9:9.3
114-
# platform: aarch64
115112
dockerfile: ../common/Dockerfile.j2
116113
privileged: true
117114
cgroupns_mode: host
@@ -145,7 +142,6 @@ platforms:
145142
command: /usr/sbin/init
146143
- name: ubuntu-focal
147144
image: ubuntu:focal
148-
# platform: s390x
149145
dockerfile: ../common/Dockerfile.j2
150146
privileged: true
151147
cgroupns_mode: host
@@ -154,7 +150,6 @@ platforms:
154150
command: /sbin/init
155151
- name: ubuntu-jammy
156152
image: ubuntu:jammy
157-
# platform: aarch64
158153
dockerfile: ../common/Dockerfile.j2
159154
privileged: true
160155
cgroupns_mode: host

‎molecule/distribution/molecule.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ platforms:
2020
command: /usr/sbin/init
2121
- name: alpine-3.17
2222
image: alpine:3.17
23-
# platform: aarch64
2423
dockerfile: ../common/Dockerfile.j2
2524
privileged: true
2625
cgroupns_mode: host
@@ -102,7 +101,6 @@ platforms:
102101
command: /usr/sbin/init
103102
- name: rhel-8
104103
image: redhat/ubi8:8.9
105-
# platform: s390x
106104
dockerfile: ../common/Dockerfile.j2
107105
privileged: true
108106
cgroupns_mode: host
@@ -111,7 +109,6 @@ platforms:
111109
command: /usr/sbin/init
112110
- name: rhel-9
113111
image: redhat/ubi9:9.3
114-
# platform: aarch64
115112
dockerfile: ../common/Dockerfile.j2
116113
privileged: true
117114
cgroupns_mode: host
@@ -145,7 +142,6 @@ platforms:
145142
command: /usr/sbin/init
146143
- name: ubuntu-focal
147144
image: ubuntu:focal
148-
# platform: s390x
149145
dockerfile: ../common/Dockerfile.j2
150146
privileged: true
151147
cgroupns_mode: host
@@ -154,7 +150,6 @@ platforms:
154150
command: /sbin/init
155151
- name: ubuntu-jammy
156152
image: ubuntu:jammy
157-
# platform: aarch64
158153
dockerfile: ../common/Dockerfile.j2
159154
privileged: true
160155
cgroupns_mode: host

‎molecule/downgrade-plus/molecule.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m
2929
command: /sbin/init
3030
- name: alpine-3.17
3131
image: alpine:3.17
32-
# platform: aarch64
3332
dockerfile: ../common/Dockerfile.j2
3433
privileged: true
3534
cgroupns_mode: host
@@ -103,7 +102,6 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m
103102
command: /usr/sbin/init
104103
- name: rhel-8
105104
image: redhat/ubi8:8.9
106-
# platform: s390x
107105
dockerfile: ../common/Dockerfile.j2
108106
privileged: true
109107
cgroupns_mode: host
@@ -112,7 +110,6 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m
112110
command: /usr/sbin/init
113111
- name: rhel-9
114112
image: redhat/ubi9:9.3
115-
# platform: aarch64
116113
dockerfile: ../common/Dockerfile.j2
117114
privileged: true
118115
cgroupns_mode: host
@@ -146,7 +143,6 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m
146143
command: /usr/sbin/init
147144
- name: ubuntu-focal
148145
image: ubuntu:focal
149-
# platform: s390x
150146
dockerfile: ../common/Dockerfile.j2
151147
privileged: true
152148
cgroupns_mode: host
@@ -155,7 +151,6 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m
155151
command: /sbin/init
156152
- name: ubuntu-jammy
157153
image: ubuntu:jammy
158-
# platform: aarch64
159154
dockerfile: ../common/Dockerfile.j2
160155
privileged: true
161156
cgroupns_mode: host

‎molecule/downgrade/molecule.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom
2020
command: /usr/sbin/init
2121
- name: alpine-3.17
2222
image: alpine:3.17
23-
# platform: aarch64
2423
dockerfile: ../common/Dockerfile.j2
2524
privileged: true
2625
cgroupns_mode: host
@@ -102,7 +101,6 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom
102101
command: /usr/sbin/init
103102
- name: rhel-8
104103
image: redhat/ubi8:8.9
105-
# platform: s390x
106104
dockerfile: ../common/Dockerfile.j2
107105
privileged: true
108106
cgroupns_mode: host
@@ -111,7 +109,6 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom
111109
command: /usr/sbin/init
112110
- name: rhel-9
113111
image: redhat/ubi9:9.3
114-
# platform: aarch64
115112
dockerfile: ../common/Dockerfile.j2
116113
privileged: true
117114
cgroupns_mode: host
@@ -145,7 +142,6 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom
145142
command: /usr/sbin/init
146143
- name: ubuntu-focal
147144
image: ubuntu:focal
148-
# platform: s390x
149145
dockerfile: ../common/Dockerfile.j2
150146
privileged: true
151147
cgroupns_mode: host
@@ -154,7 +150,6 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom
154150
command: /sbin/init
155151
- name: ubuntu-jammy
156152
image: ubuntu:jammy
157-
# platform: aarch64
158153
dockerfile: ../common/Dockerfile.j2
159154
privileged: true
160155
cgroupns_mode: host

‎molecule/plus/molecule.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ platforms:
2929
command: /sbin/init
3030
- name: alpine-3.17
3131
image: alpine:3.17
32-
# platform: aarch64
3332
dockerfile: ../common/Dockerfile.j2
3433
privileged: true
3534
cgroupns_mode: host
@@ -103,7 +102,6 @@ platforms:
103102
command: /usr/sbin/init
104103
- name: rhel-8
105104
image: redhat/ubi8:8.9
106-
# platform: s390x
107105
dockerfile: ../common/Dockerfile.j2
108106
privileged: true
109107
cgroupns_mode: host
@@ -112,7 +110,6 @@ platforms:
112110
command: /usr/sbin/init
113111
- name: rhel-9
114112
image: redhat/ubi9:9.3
115-
# platform: aarch64
116113
dockerfile: ../common/Dockerfile.j2
117114
privileged: true
118115
cgroupns_mode: host
@@ -146,7 +143,6 @@ platforms:
146143
command: /usr/sbin/init
147144
- name: ubuntu-focal
148145
image: ubuntu:focal
149-
# platform: s390x
150146
dockerfile: ../common/Dockerfile.j2
151147
privileged: true
152148
cgroupns_mode: host
@@ -155,7 +151,6 @@ platforms:
155151
command: /sbin/init
156152
- name: ubuntu-jammy
157153
image: ubuntu:jammy
158-
# platform: aarch64
159154
dockerfile: ../common/Dockerfile.j2
160155
privileged: true
161156
cgroupns_mode: host

‎molecule/source-version/molecule.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ platforms:
2020
command: /usr/sbin/init
2121
- name: alpine-3.17
2222
image: alpine:3.17
23-
# platform: aarch64
2423
dockerfile: ../common/Dockerfile.j2
2524
privileged: true
2625
cgroupns_mode: host
@@ -102,7 +101,6 @@ platforms:
102101
command: /usr/sbin/init
103102
- name: rhel-8
104103
image: redhat/ubi8:8.9
105-
# platform: s390x
106104
dockerfile: ../common/Dockerfile.j2
107105
privileged: true
108106
cgroupns_mode: host
@@ -111,7 +109,6 @@ platforms:
111109
command: /usr/sbin/init
112110
- name: rhel-9
113111
image: redhat/ubi9:9.3
114-
# platform: aarch64
115112
dockerfile: ../common/Dockerfile.j2
116113
privileged: true
117114
cgroupns_mode: host
@@ -145,7 +142,6 @@ platforms:
145142
command: /usr/sbin/init
146143
- name: ubuntu-focal
147144
image: ubuntu:focal
148-
# platform: s390x
149145
dockerfile: ../common/Dockerfile.j2
150146
privileged: true
151147
cgroupns_mode: host
@@ -154,7 +150,6 @@ platforms:
154150
command: /sbin/init
155151
- name: ubuntu-jammy
156152
image: ubuntu:jammy
157-
# platform: aarch64
158153
dockerfile: ../common/Dockerfile.j2
159154
privileged: true
160155
cgroupns_mode: host

0 commit comments

Comments
 (0)