From 0ca2e4337118d5d61960d2e2422296b5fd999f91 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Wed, 29 May 2024 17:33:52 +0200 Subject: [PATCH 1/7] Update list of supported NGINX versions --- CHANGELOG.md | 6 ++++-- README.md | 4 +++- molecule/default/molecule.yml | 12 ++++++++++-- molecule/distribution/molecule.yml | 13 ++++++++++--- molecule/downgrade-plus/converge.yml | 8 ++++---- molecule/downgrade-plus/molecule.yml | 26 +++++++++++++++++--------- molecule/downgrade/converge.yml | 8 ++++---- molecule/downgrade/molecule.yml | 12 ++++++++++-- molecule/plus/molecule.yml | 8 ++++++++ molecule/source-version/molecule.yml | 12 ++++++++++-- molecule/source/molecule.yml | 12 ++++++++++-- molecule/stable/molecule.yml | 12 ++++++++++-- molecule/uninstall-plus/molecule.yml | 8 ++++++++ molecule/uninstall/molecule.yml | 12 ++++++++++-- molecule/upgrade-plus/molecule.yml | 26 +++++++++++++++++--------- molecule/upgrade-plus/prepare.yml | 8 ++++---- molecule/upgrade/molecule.yml | 12 ++++++++++-- molecule/upgrade/prepare.yml | 8 ++++---- molecule/version/converge.yml | 16 ++++++++-------- molecule/version/molecule.yml | 12 ++++++++++-- vars/main.yml | 10 +++++----- 21 files changed, 176 insertions(+), 69 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15afe58b0..3f6671c7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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(24.04) to the list of NGINX OSS and NGINX Plus tested and supported distributions. +- Add Ubuntu matic(23.10) to the list of supported NGINX OSS distributions. +- Remove Alpine Linux 3.15 and Ubuntu lunar (23.04) from the list of supported NGINX OSS distributions. +- Remove from the list of NGINX OSS and NGINX Plus tested and supported distributions. ENHANCEMENTS: diff --git a/README.md b/README.md index 153659d9b..df2c543ba 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,8 @@ SUSE/SLES: Ubuntu: - focal (20.04) - jammy (22.04) - - lunar (23.04) + - mantic (23.10) + - noble (24.04) ``` ### NGINX Plus @@ -184,6 +185,7 @@ SUSE/SLES: Ubuntu: - focal (20.04) - jammy (22.04) + - noble (24.04) ``` ### NGINX Agent diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index f1012872a..e96eb14d8 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -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 diff --git a/molecule/distribution/molecule.yml b/molecule/distribution/molecule.yml index e1a945f7b..d14dd53e2 100644 --- a/molecule/distribution/molecule.yml +++ b/molecule/distribution/molecule.yml @@ -189,9 +189,16 @@ 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-jammy - image: ubuntu:jammy - # platform: aarch64 + - 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 diff --git a/molecule/downgrade-plus/converge.yml b/molecule/downgrade-plus/converge.yml index 5d0eb35ec..24e73acb7 100644 --- a/molecule/downgrade-plus/converge.yml +++ b/molecule/downgrade-plus/converge.yml @@ -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: diff --git a/molecule/downgrade-plus/molecule.yml b/molecule/downgrade-plus/molecule.yml index 3496a54f5..50b968620 100644 --- a/molecule/downgrade-plus/molecule.yml +++ b/molecule/downgrade-plus/molecule.yml @@ -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 @@ -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 @@ -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: diff --git a/molecule/downgrade/converge.yml b/molecule/downgrade/converge.yml index 47ad7a196..56a8c1e9a 100644 --- a/molecule/downgrade/converge.yml +++ b/molecule/downgrade/converge.yml @@ -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: diff --git a/molecule/downgrade/molecule.yml b/molecule/downgrade/molecule.yml index 73247771b..7c2893838 100644 --- a/molecule/downgrade/molecule.yml +++ b/molecule/downgrade/molecule.yml @@ -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 diff --git a/molecule/plus/molecule.yml b/molecule/plus/molecule.yml index 80ad086c8..e22a66012 100644 --- a/molecule/plus/molecule.yml +++ b/molecule/plus/molecule.yml @@ -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: diff --git a/molecule/source-version/molecule.yml b/molecule/source-version/molecule.yml index f1b284cfa..5f2d0ac5f 100644 --- a/molecule/source-version/molecule.yml +++ b/molecule/source-version/molecule.yml @@ -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 diff --git a/molecule/source/molecule.yml b/molecule/source/molecule.yml index f1b284cfa..5f2d0ac5f 100644 --- a/molecule/source/molecule.yml +++ b/molecule/source/molecule.yml @@ -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 diff --git a/molecule/stable/molecule.yml b/molecule/stable/molecule.yml index f1012872a..e96eb14d8 100644 --- a/molecule/stable/molecule.yml +++ b/molecule/stable/molecule.yml @@ -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 diff --git a/molecule/uninstall-plus/molecule.yml b/molecule/uninstall-plus/molecule.yml index 80ad086c8..e22a66012 100644 --- a/molecule/uninstall-plus/molecule.yml +++ b/molecule/uninstall-plus/molecule.yml @@ -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: diff --git a/molecule/uninstall/molecule.yml b/molecule/uninstall/molecule.yml index c4dd6d02d..3d1283e0a 100644 --- a/molecule/uninstall/molecule.yml +++ b/molecule/uninstall/molecule.yml @@ -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 diff --git a/molecule/upgrade-plus/molecule.yml b/molecule/upgrade-plus/molecule.yml index ae07e9f73..932c237fd 100644 --- a/molecule/upgrade-plus/molecule.yml +++ b/molecule/upgrade-plus/molecule.yml @@ -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 @@ -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 @@ -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: diff --git a/molecule/upgrade-plus/prepare.yml b/molecule/upgrade-plus/prepare.yml index 6fc4b4d85..01cae639c 100644 --- a/molecule/upgrade-plus/prepare.yml +++ b/molecule/upgrade-plus/prepare.yml @@ -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 diff --git a/molecule/upgrade/molecule.yml b/molecule/upgrade/molecule.yml index c4dd6d02d..3d1283e0a 100644 --- a/molecule/upgrade/molecule.yml +++ b/molecule/upgrade/molecule.yml @@ -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 diff --git a/molecule/upgrade/prepare.yml b/molecule/upgrade/prepare.yml index 3d42b027d..e1da093a8 100644 --- a/molecule/upgrade/prepare.yml +++ b/molecule/upgrade/prepare.yml @@ -4,19 +4,19 @@ pre_tasks: - name: Set repo if Alpine ansible.builtin.set_fact: - version: =1.25.3-r1 + version: =1.25.5-r1 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'] }} 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 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 when: ansible_facts['os_family'] == "Suse" tasks: - name: Install NGINX diff --git a/molecule/version/converge.yml b/molecule/version/converge.yml index 61e3a26ae..d3e43c789 100644 --- a/molecule/version/converge.yml +++ b/molecule/version/converge.yml @@ -4,26 +4,26 @@ pre_tasks: - name: Set repo if Alpine ansible.builtin.set_fact: - ngx_version: =1.25.3-r1 - njs_version: =1.25.3.0.8.2-r1 + ngx_version: =1.25.5-r1 + njs_version: =1.25.5.0.8.4-r1 cacheable: true when: ansible_facts['os_family'] == "Alpine" - name: Set repo if Debian ansible.builtin.set_fact: - ngx_version: =1.25.3-1~{{ ansible_facts['distribution_release'] }} - njs_version: =1.25.3+0.8.2-1~{{ ansible_facts['distribution_release'] }} + ngx_version: =1.25.5-1~{{ ansible_facts['distribution_release'] }} + njs_version: =1.25.5+0.8.4-1~{{ ansible_facts['distribution_release'] }} cacheable: true when: ansible_facts['os_family'] == "Debian" - name: Set repo if Red Hat ansible.builtin.set_fact: - ngx_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 - njs_version: -1.25.3+0.8.2-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx + 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 + njs_version: -1.25.5+0.8.4-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: - ngx_version: =1.25.3-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx - njs_version: =1.25.3+0.8.2-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx + ngx_version: =1.25.5-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx + njs_version: =1.25.5+0.8.4-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx cacheable: true when: ansible_facts['os_family'] == "Suse" tasks: diff --git a/molecule/version/molecule.yml b/molecule/version/molecule.yml index e3809de45..62ab555a9 100644 --- a/molecule/version/molecule.yml +++ b/molecule/version/molecule.yml @@ -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 diff --git a/vars/main.yml b/vars/main.yml index 0e9af339a..668a1d189 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -44,11 +44,11 @@ nginx_supported_distributions: oraclelinux: name: Oracle Linux versions: [7, 8, 9] - architectures: "{{ (['x86_64', 'aarch64'] + ['s390x']) if (ansible_facts['distribution_major_version'] is version('8', '>=')) else ['x86_64', 'aarch64'] }}" + architectures: "{{ ['x86_64', 'aarch64', 's390x'] if (ansible_facts['distribution_major_version'] is version('8', '>=')) else ['x86_64', 'aarch64'] }}" redhat: name: Red Hat Enterprise Linux versions: [7, 8, 9] - architectures: "{{ (['x86_64', 'aarch64'] + ['s390x']) if (ansible_facts['distribution_major_version'] is version('8', '>=')) else ['x86_64', 'aarch64'] }}" + architectures: "{{ ['x86_64', 'aarch64', 's390x'] if (ansible_facts['distribution_major_version'] is version('8', '>=')) else ['x86_64', 'aarch64'] }}" rocky: name: Rocky Linux versions: [8, 9] @@ -59,8 +59,8 @@ nginx_supported_distributions: architectures: [x86_64] ubuntu: name: Ubuntu - versions: [20.04, 22.04, 23.04] - 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'] }}" + versions: [20.04, 22.04, 23.10, 24.04] + 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'] }}" # Supported NGINX Plus distributions # https://docs.nginx.com/nginx/technical-specs/ @@ -107,7 +107,7 @@ nginx_plus_supported_distributions: architectures: [x86_64] ubuntu: name: Ubuntu - versions: [20.04, 22.04] + versions: [20.04, 22.04, 24.04] architectures: "{{ (['x86_64', 'aarch64'] + ['s390x']) if (ansible_facts['distribution_version'] is version('20.04', '>=')) else ['x86_64', 'aarch64'] }}" # Default NGINX signing key From 0dbc804e987cb51f1edc6561b6d9715e53716fbc Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Wed, 29 May 2024 17:34:46 +0200 Subject: [PATCH 2/7] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f6671c7a..8efdbd115 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,8 @@ FEATURES: - Implement the ability to install the NGINX Agent. - Add Amazon Linux 2023, Alpine Linux 3.19 and Ubuntu noble(24.04) to the list of NGINX OSS and NGINX Plus tested and supported distributions. - Add Ubuntu matic(23.10) to the list of supported NGINX OSS distributions. -- Remove Alpine Linux 3.15 and Ubuntu lunar (23.04) from the list of supported NGINX OSS distributions. -- Remove from the list of NGINX OSS and NGINX Plus tested and supported distributions. +- Remove Ubuntu lunar (23.04) 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: From 56ef4f8dd860c315b6e3756fb7abfd39662434a3 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Wed, 29 May 2024 17:35:32 +0200 Subject: [PATCH 3/7] Update CHANGELOG.md --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8efdbd115..68cad0847 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,9 @@ FEATURES: - Implement the ability to install the NGINX Agent. -- Add Amazon Linux 2023, Alpine Linux 3.19 and Ubuntu noble(24.04) to the list of NGINX OSS and NGINX Plus tested and supported distributions. -- Add Ubuntu matic(23.10) to the list of supported NGINX OSS distributions. -- Remove Ubuntu lunar (23.04) from the list of supported NGINX OSS 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: From 07042678f0e0294580d475bed43e962b7c675dd1 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Wed, 29 May 2024 18:14:10 +0200 Subject: [PATCH 4/7] Update main.yml --- vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/main.yml b/vars/main.yml index 668a1d189..afa4bc32e 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -135,7 +135,7 @@ nginx_plus_default_repository_suse: https://pkgs.nginx.com/plus/sles/{{ ansible_ nginx_alpine_dependencies: [ca-certificates, coreutils, openssl, pcre2] # Debian dependencies -nginx_debian_dependencies: [apt-transport-https, ca-certificates, gpg-agent] +nginx_debian_dependencies: [apt-transport-https, ca-certificates, gnupg, gpg-agent] # FreeBSD dependencies nginx_freebsd_dependencies: [security/ca_root_nss] From 874b016b477a70a0c21d7cc2c148e609caabef12 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Wed, 29 May 2024 18:34:42 +0200 Subject: [PATCH 5/7] Update molecule.yml --- molecule/distribution/molecule.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/molecule/distribution/molecule.yml b/molecule/distribution/molecule.yml index d14dd53e2..690366831 100644 --- a/molecule/distribution/molecule.yml +++ b/molecule/distribution/molecule.yml @@ -189,6 +189,15 @@ 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-jammy + image: ubuntu:jammy + # platform: aarch64 + 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 From 40daf07a0e786dec8973b27344426c2fce065165 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Wed, 29 May 2024 20:23:24 +0200 Subject: [PATCH 6/7] fix tests --- molecule/downgrade-plus/molecule.yml | 16 ++++++++-------- molecule/version/converge.yml | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/molecule/downgrade-plus/molecule.yml b/molecule/downgrade-plus/molecule.yml index 50b968620..c710a432e 100644 --- a/molecule/downgrade-plus/molecule.yml +++ b/molecule/downgrade-plus/molecule.yml @@ -189,14 +189,14 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m 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-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: diff --git a/molecule/version/converge.yml b/molecule/version/converge.yml index d3e43c789..bb2b1fc6e 100644 --- a/molecule/version/converge.yml +++ b/molecule/version/converge.yml @@ -5,25 +5,25 @@ - name: Set repo if Alpine ansible.builtin.set_fact: ngx_version: =1.25.5-r1 - njs_version: =1.25.5.0.8.4-r1 + njs_version: =1.25.5.0.8.4-r3 cacheable: true when: ansible_facts['os_family'] == "Alpine" - name: Set repo if Debian ansible.builtin.set_fact: ngx_version: =1.25.5-1~{{ ansible_facts['distribution_release'] }} - njs_version: =1.25.5+0.8.4-1~{{ ansible_facts['distribution_release'] }} + njs_version: =1.25.5+0.8.4-3~{{ ansible_facts['distribution_release'] }} cacheable: true when: ansible_facts['os_family'] == "Debian" - name: Set repo if Red Hat ansible.builtin.set_fact: 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 - njs_version: -1.25.5+0.8.4-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx + njs_version: -1.25.5+0.8.4-3.{{ (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: ngx_version: =1.25.5-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx - njs_version: =1.25.5+0.8.4-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx + njs_version: =1.25.5+0.8.4-3.sles{{ ansible_facts['distribution_major_version'] }}.ngx cacheable: true when: ansible_facts['os_family'] == "Suse" tasks: From cdd9449caeb107999e123d5a06fbdcabfe20024c Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Fri, 31 May 2024 17:55:18 +0200 Subject: [PATCH 7/7] fixes --- tasks/keys/setup-keys.yml | 4 ++-- vars/main.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tasks/keys/setup-keys.yml b/tasks/keys/setup-keys.yml index e0ce91d7d..6a945eb02 100644 --- a/tasks/keys/setup-keys.yml +++ b/tasks/keys/setup-keys.yml @@ -19,13 +19,13 @@ - name: (Debian/Ubuntu) Add NGINX signing key ansible.builtin.apt_key: - id: 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 + id: 8540A6F18833A80E9C1653A42FD21310B49F6B46 keyring: /usr/share/keyrings/nginx-archive-keyring.gpg url: "{{ keysite }}" when: ansible_facts['os_family'] == 'Debian' - name: (Red Hat/SLES OSs) Add NGINX signing key ansible.builtin.rpm_key: - fingerprint: 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 + fingerprint: 8540A6F18833A80E9C1653A42FD21310B49F6B46 key: "{{ keysite }}" when: ansible_facts['os_family'] in ['RedHat', 'Suse'] diff --git a/vars/main.yml b/vars/main.yml index afa4bc32e..988a1d911 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -92,11 +92,11 @@ nginx_plus_supported_distributions: oraclelinux: name: Oracle Linux versions: [7, 8, 9] - architectures: "{{ (['x86_64'] + ['aarch64']) if (ansible_facts['distribution_major_version'] is version('8', '==')) else ['x86_64'] }}" + architectures: "{{ ['x86_64', 'aarch64'] if (ansible_facts['distribution_major_version'] is version('8', '==')) else ['x86_64'] }}" redhat: name: Red Hat Enterprise Linux versions: [7, 8, 9] - architectures: "{{ (['x86_64', 'aarch64'] + ['s390x']) if (ansible_facts['distribution_major_version'] is version('8', '>=')) else ['x86_64', 'aarch64'] }}" + architectures: "{{ ['x86_64', 'aarch64', 's390x'] if (ansible_facts['distribution_major_version'] is version('8', '>=')) else ['x86_64', 'aarch64'] }}" rocky: name: Rocky Linux versions: [8, 9] @@ -108,7 +108,7 @@ nginx_plus_supported_distributions: ubuntu: name: Ubuntu versions: [20.04, 22.04, 24.04] - architectures: "{{ (['x86_64', 'aarch64'] + ['s390x']) if (ansible_facts['distribution_version'] is version('20.04', '>=')) else ['x86_64', 'aarch64'] }}" + 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'] }}" # Default NGINX signing key nginx_default_signing_key_pgp: https://nginx.org/keys/nginx_signing.key