Skip to content

Commit f838a2f

Browse files
committed
remove ubuntu-focal platform from molecule default platforms
Ubuntu 20.04 LTS (Focal Fossa) is out of standard support on 31 May 2025.
1 parent bf67991 commit f838a2f

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

.config/molecule/config.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,6 @@ platforms:
154154
volumes:
155155
- /sys/fs/cgroup:/sys/fs/cgroup:rw
156156
command: /usr/sbin/init
157-
- name: ubuntu-focal
158-
image: ubuntu:focal
159-
dockerfile: ../common/Dockerfile.j2
160-
privileged: true
161-
cgroupns_mode: host
162-
volumes:
163-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
164-
command: /sbin/init
165157
- name: ubuntu-jammy
166158
image: ubuntu:jammy
167159
dockerfile: ../common/Dockerfile.j2

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ Rocky Linux:
196196
SUSE/SLES:
197197
- 15 SP6+
198198
Ubuntu:
199-
- focal (20.04)
200199
- jammy (22.04)
201200
- noble (24.04)
202201
```

vars/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ nginx_supported_distributions:
5959
architectures: [x86_64]
6060
ubuntu:
6161
name: Ubuntu
62-
architectures: "{{ ['x86_64', 'aarch64', 's390x'] if ((ansible_facts['distribution_version'] is version('20.04', '==')) or (ansible_facts['distribution_version'] is version('22.04', '=='))) else ['x86_64', 'aarch64'] }}"
63-
versions: [20.04, 22.04, 24.04]
62+
versions: [22.04, 24.04]
63+
architectures: "{{ ['x86_64', 'aarch64', 's390x'] if (ansible_facts['distribution_version'] is version('22.04', '==')) else ['x86_64', 'aarch64'] }}"
6464

6565
# Supported NGINX Plus distributions
6666
# https://docs.nginx.com/nginx/technical-specs/

0 commit comments

Comments
 (0)