Skip to content

Update list of supported NGINX versions #719

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 7 commits into from
May 31, 2024
Merged

Update list of supported NGINX versions #719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0ca2e43
Update list of supported NGINX versions
alessfg May 29, 2024
0dbc804
Update CHANGELOG.md
alessfg May 29, 2024
56ef4f8
Update CHANGELOG.md
alessfg May 29, 2024
0704267
Update main.yml
alessfg May 29, 2024
874b016
Update molecule.yml
alessfg May 29, 2024
40daf07
fix tests
alessfg May 29, 2024
cdd9449
fixes
alessfg May 31, 2024
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: 4 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
FEATURES:

- Implement the ability to install the NGINX Agent.
- Add Amazon Linux 2023 and Alpine Linux 3.19 to the list of NGINX Open Source and NGINX Plus tested and supported distributions.
- Remove Alpine Linux 3.15 from the list of NGINX Open Source and NGINX Plus tested and supported distributions.
- Add Amazon Linux 2023, Alpine Linux 3.19 and Ubuntu noble to the list of NGINX OSS and NGINX Plus tested and supported distributions.
- Add Ubuntu matic to the list of supported NGINX OSS distributions.
- Remove Ubuntu lunar from the list of supported NGINX OSS distributions.
- Remove Alpine Linux 3.15 from the list of NGINX OSS and NGINX Plus tested and supported distributions.

ENHANCEMENTS:

Expand Down
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ SUSE/SLES:
Ubuntu:
- focal (20.04)
- jammy (22.04)
- lunar (23.04)
- mantic (23.10)
- noble (24.04)
```

### NGINX Plus
Expand Down Expand Up @@ -184,6 +185,7 @@ SUSE/SLES:
Ubuntu:
- focal (20.04)
- jammy (22.04)
- noble (24.04)
```

### NGINX Agent
Expand Down
12 changes: 10 additions & 2 deletions molecule/default/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,16 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: ubuntu-lunar
image: ubuntu:lunar
- 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
Expand Down
16 changes: 16 additions & 0 deletions molecule/distribution/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,22 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
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
Expand Down
8 changes: 4 additions & 4 deletions molecule/downgrade-plus/converge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
pre_tasks:
- name: Set repo if Alpine
ansible.builtin.set_fact:
version: =30-r1
version: =31-r1
cacheable: true
when: ansible_facts['os_family'] == "Alpine"
- name: Set repo if Debian
ansible.builtin.set_fact:
version: =30-1~{{ ansible_facts['distribution_release'] }}
version: =31-1~{{ ansible_facts['distribution_release'] }}
cacheable: true
when: ansible_facts['os_family'] == "Debian"
- name: Set repo if Red Hat
ansible.builtin.set_fact:
version: -30-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
version: -31-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
cacheable: true
when: ansible_facts['os_family'] == "RedHat"
- name: Set repo if SLES
ansible.builtin.set_fact:
version: =30-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
version: =31-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
cacheable: true
when: ansible_facts['os_family'] == "Suse"
tasks:
Expand Down
26 changes: 17 additions & 9 deletions molecule/downgrade-plus/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
driver:
name: docker
platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the moment) so it's impossible to test the downgrade scenario
platforms: # Ubuntu noble only has one version of NGINX Plus available (at the moment) so it's impossible to test the downgrade scenario
- name: almalinux-8
image: almalinux:8
dockerfile: ../common/Dockerfile.j2
Expand Down Expand Up @@ -44,14 +44,14 @@ platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the mo
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
# - name: alpine-3.19
# image: alpine:3.19
# dockerfile: ../common/Dockerfile.j2
# privileged: true
# cgroupns_mode: host
# volumes:
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
# command: /sbin/init
- name: alpine-3.19
image: alpine:3.19
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: amazonlinux-2
image: amazonlinux:2
platform: x86_64
Expand Down Expand Up @@ -189,6 +189,14 @@ platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the mo
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
playbooks:
Expand Down
8 changes: 4 additions & 4 deletions molecule/downgrade/converge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
pre_tasks:
- name: Set repo if Alpine
ansible.builtin.set_fact:
version: =1.25.3-r1
version: =1.25.5-r1
cacheable: true
when: ansible_facts['os_family'] == "Alpine"
- name: Set repo if Debian
ansible.builtin.set_fact:
version: =1.25.3-1~{{ ansible_facts['distribution_release'] }}
version: =1.25.5-1~{{ ansible_facts['distribution_release'] }}
cacheable: true
when: ansible_facts['os_family'] == "Debian"
- name: Set repo if Red Hat
ansible.builtin.set_fact:
version: -1.25.3-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
version: -1.25.5-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
cacheable: true
when: ansible_facts['os_family'] == "RedHat"
- name: Set repo if SLES
ansible.builtin.set_fact:
version: =1.25.3-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
version: =1.25.5-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
cacheable: true
when: ansible_facts['os_family'] == "Suse"
tasks:
Expand Down
12 changes: 10 additions & 2 deletions molecule/downgrade/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,16 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: ubuntu-lunar
image: ubuntu:lunar
- 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
Expand Down
8 changes: 8 additions & 0 deletions molecule/plus/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,14 @@ platforms:
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
playbooks:
Expand Down
12 changes: 10 additions & 2 deletions molecule/source-version/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,16 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: ubuntu-lunar
image: ubuntu:lunar
- 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
Expand Down
12 changes: 10 additions & 2 deletions molecule/source/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,16 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: ubuntu-lunar
image: ubuntu:lunar
- 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
Expand Down
12 changes: 10 additions & 2 deletions molecule/stable/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,16 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: ubuntu-lunar
image: ubuntu:lunar
- 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
Expand Down
8 changes: 8 additions & 0 deletions molecule/uninstall-plus/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,14 @@ platforms:
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
playbooks:
Expand Down
12 changes: 10 additions & 2 deletions molecule/uninstall/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,16 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: ubuntu-lunar
image: ubuntu:lunar
- 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
Expand Down
26 changes: 17 additions & 9 deletions molecule/upgrade-plus/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
driver:
name: docker
platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the moment) so it's impossible to test the downgrade scenario
platforms: # Ubuntu noble only has one version of NGINX Plus available (at the moment) so it's impossible to test the downgrade scenario
- name: almalinux-8
image: almalinux:8
dockerfile: ../common/Dockerfile.j2
Expand Down Expand Up @@ -44,14 +44,14 @@ platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the mo
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
# - name: alpine-3.19
# image: alpine:3.19
# dockerfile: ../common/Dockerfile.j2
# privileged: true
# cgroupns_mode: host
# volumes:
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
# command: /sbin/init
- name: alpine-3.19
image: alpine:3.19
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: amazonlinux-2
image: amazonlinux:2
platform: x86_64
Expand Down Expand Up @@ -189,6 +189,14 @@ platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the mo
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
playbooks:
Expand Down
8 changes: 4 additions & 4 deletions molecule/upgrade-plus/prepare.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@
pre_tasks:
- name: Set repo if Alpine
ansible.builtin.set_fact:
version: =30-r1
version: =31-r1
when: ansible_facts['os_family'] == "Alpine"
- name: Set repo if Debian
ansible.builtin.set_fact:
version: =30-1~{{ ansible_facts['distribution_release'] }}
version: =31-1~{{ ansible_facts['distribution_release'] }}
when: ansible_facts['os_family'] == "Debian"
- name: Set repo if Red Hat
ansible.builtin.set_fact:
version: -30-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
version: -31-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
when: ansible_facts['os_family'] == "RedHat"
- name: Set repo if SLES
ansible.builtin.set_fact:
version: =30-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
version: =31-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
when: ansible_facts['os_family'] == "Suse"
tasks:
- name: Install NGINX
Expand Down
12 changes: 10 additions & 2 deletions molecule/upgrade/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,16 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: ubuntu-lunar
image: ubuntu:lunar
- 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
Expand Down
Loading
Loading