From 928d84cf75a55d9e9e7f6874b720a8b8d6bddf33 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Mon, 16 May 2022 15:03:36 +0200 Subject: [PATCH 1/3] Add support for Ubuntu jammy --- CHANGELOG.md | 4 ++++ README.md | 1 + meta/main.yml | 3 ++- molecule/default/converge.yml | 6 +++--- molecule/default/molecule.yml | 7 +++++++ molecule/module/molecule.yml | 7 +++++++ molecule/source/molecule.yml | 7 +++++++ molecule/uninstall/molecule.yml | 7 +++++++ 8 files changed, 38 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aaada5a87..670278e5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 0.23.2 (Unreleased) +FEATURES: + +Add support for Ubuntu jammy (22.04). + BUG FIXES: * Ensure gpg-agent is installed on Ubuntu/Debian to avoid APT key tasks failures. diff --git a/README.md b/README.md index bf3297fc7..15ad5b0c5 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,7 @@ Ubuntu: - bionic (18.04) - focal (20.04) - impish (21.10) + - jammy (22.04) ``` ### NGINX Plus diff --git a/meta/main.yml b/meta/main.yml index 3449f4b8e..18de99f53 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -32,7 +32,8 @@ galaxy_info: versions: - bionic - focal - - hirsute + - impish + - jammy - name: SLES versions: - 12 diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index c54684f20..fc6cd47a2 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -4,15 +4,15 @@ pre_tasks: - name: Set repo if Alpine ansible.builtin.set_fact: - version: "=1.21.5-r1" + version: "=1.21.6-r1" when: ansible_facts['os_family'] == "Alpine" - name: Set repo if Debian ansible.builtin.set_fact: - version: "=1.21.5-1~{{ ansible_facts['distribution_release'] }}" + version: "=1.21.6-1~{{ ansible_facts['distribution_release'] }}" when: ansible_facts['os_family'] == "Debian" - name: Set repo if Red Hat ansible.builtin.set_fact: - version: "-1.21.5-1.{{ (ansible_facts['distribution'] == 'Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx" + version: "-1.21.6-1.{{ (ansible_facts['distribution'] == 'Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx" when: ansible_facts['os_family'] == "RedHat" tasks: - name: Install NGINX diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 3f007e882..f5cd5a903 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -90,6 +90,13 @@ platforms: volumes: - "/sys/fs/cgroup:/sys/fs/cgroup:rw" command: "/sbin/init" + - name: ubuntu-jammy + image: ubuntu:jammy + dockerfile: ../common/Dockerfile.j2 + privileged: true + volumes: + - "/sys/fs/cgroup:/sys/fs/cgroup:rw" + command: "/sbin/init" provisioner: name: ansible playbooks: diff --git a/molecule/module/molecule.yml b/molecule/module/molecule.yml index 3f007e882..f5cd5a903 100644 --- a/molecule/module/molecule.yml +++ b/molecule/module/molecule.yml @@ -90,6 +90,13 @@ platforms: volumes: - "/sys/fs/cgroup:/sys/fs/cgroup:rw" command: "/sbin/init" + - name: ubuntu-jammy + image: ubuntu:jammy + dockerfile: ../common/Dockerfile.j2 + privileged: true + volumes: + - "/sys/fs/cgroup:/sys/fs/cgroup:rw" + command: "/sbin/init" provisioner: name: ansible playbooks: diff --git a/molecule/source/molecule.yml b/molecule/source/molecule.yml index 3f007e882..f5cd5a903 100644 --- a/molecule/source/molecule.yml +++ b/molecule/source/molecule.yml @@ -90,6 +90,13 @@ platforms: volumes: - "/sys/fs/cgroup:/sys/fs/cgroup:rw" command: "/sbin/init" + - name: ubuntu-jammy + image: ubuntu:jammy + dockerfile: ../common/Dockerfile.j2 + privileged: true + 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 05359863c..19a3e2250 100644 --- a/molecule/uninstall/molecule.yml +++ b/molecule/uninstall/molecule.yml @@ -90,6 +90,13 @@ platforms: volumes: - "/sys/fs/cgroup:/sys/fs/cgroup:rw" command: "/sbin/init" + - name: ubuntu-jammy + image: ubuntu:jammy + dockerfile: ../common/Dockerfile.j2 + privileged: true + volumes: + - "/sys/fs/cgroup:/sys/fs/cgroup:rw" + command: "/sbin/init" provisioner: name: ansible playbooks: From ce698d94d8781eb4b0d57a02d815105a42e16cee Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Mon, 16 May 2022 15:05:33 +0200 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 670278e5d..13235cfc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ FEATURES: -Add support for Ubuntu jammy (22.04). +Add support for NGINX OSS on Ubuntu jammy (22.04). BUG FIXES: From 37541c84d8a170c3326ef72420c9d05a59c6446e Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Mon, 16 May 2022 16:03:37 +0200 Subject: [PATCH 3/3] Update verify.yml --- molecule/default/verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index b0263ec78..d9fbc067c 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -30,4 +30,4 @@ chdir: "{{ ((ansible_facts['system'] | lower is not search('bsd')) | ternary('/etc/nginx', '/usr/local/sbin')) }}" changed_when: false register: version - failed_when: version is not search('1.21.5') + failed_when: version is not search('1.21.6')