From 3b037549f79bce61b5bcbbf559192b728d3d9aee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jan 2022 20:04:47 +0000 Subject: [PATCH 1/4] Bump ansible-lint from 5.3.1 to 5.3.2 in /.github/workflows/requirements Bumps [ansible-lint](https://github.com/ansible-community/ansible-lint) from 5.3.1 to 5.3.2. - [Release notes](https://github.com/ansible-community/ansible-lint/releases) - [Commits](https://github.com/ansible-community/ansible-lint/compare/v5.3.1...v5.3.2) --- updated-dependencies: - dependency-name: ansible-lint dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/requirements/requirements_molecule.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/requirements/requirements_molecule.txt b/.github/workflows/requirements/requirements_molecule.txt index cf5f0fa8d..2461b22eb 100644 --- a/.github/workflows/requirements/requirements_molecule.txt +++ b/.github/workflows/requirements/requirements_molecule.txt @@ -1,6 +1,6 @@ ansible-core==2.12.1 jinja2==3.0.3 -ansible-lint==5.3.1 +ansible-lint==5.3.2 yamllint==1.26.3 molecule[docker]==3.5.2 docker==5.0.3 From af04333494197b6552b4498d8625e3cd12e8e428 Mon Sep 17 00:00:00 2001 From: alessfg Date: Wed, 2 Feb 2022 00:18:48 +0100 Subject: [PATCH 2/4] Multiple fixes --- CHANGELOG.md | 10 ++++++++++ README.md | 2 -- molecule/default/converge.yml | 6 +++--- molecule/default/molecule.yml | 7 ------- molecule/downgrade/converge.yml | 6 +++--- molecule/downgrade/molecule.yml | 7 ------- molecule/downgrade/prepare.yml | 6 +++--- molecule/module/molecule.yml | 7 ------- molecule/plus/molecule.yml | 7 ------- molecule/source/molecule.yml | 7 ------- molecule/uninstall/molecule.yml | 7 ------- molecule/uninstall_plus/molecule.yml | 7 ------- molecule/upgrade/molecule.yml | 7 ------- molecule/upgrade/prepare.yml | 6 +++--- molecule/upgrade/verify.yml | 13 ++++++++++++- 15 files changed, 34 insertions(+), 71 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 530782514..9642a6da9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## 0.23.0 (Unreleased) + +BREAKING CHANGES: + +CentOS 8 has reached EoL and has thus been removed from the list of supported platforms. + +BUG FIXES: + +The Molecule `upgrade` scenario verification test no longer has to be updated on each new NGINX OSS release. + ## 0.22.0 (December 9, 2021) BREAKING CHANGES: diff --git a/README.md b/README.md index 95db16ef8..4555b4b32 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,6 @@ Amazon Linux: - 2 CentOS: - 7.4+ - - 8 Debian: - buster (10) - bullseye (11) @@ -109,7 +108,6 @@ Amazon Linux 2: - any CentOS: - 7.4+ - - 8 Debian: - buster (10) - bullseye (11) diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 17427dd58..a7e2b6f07 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -4,15 +4,15 @@ pre_tasks: - name: Set repo if Alpine set_fact: - version: "=1.21.4-r1" + version: "=1.21.5-r1" when: ansible_facts['os_family'] == "Alpine" - name: Set repo if Debian set_fact: - version: "=1.21.4-1~{{ ansible_facts['distribution_release'] }}" + version: "=1.21.5-1~{{ ansible_facts['distribution_release'] }}" when: ansible_facts['os_family'] == "Debian" - name: Set repo if Red Hat set_fact: - version: "-1.21.4-1.{{ (ansible_facts['distribution']=='Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx" + version: "-1.21.5-1.{{ (ansible_facts['distribution']=='Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx" when: ansible_facts['os_family'] == "RedHat" - name: Enable NGINX @CentOS-AppStream dnf modules shell: diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 8a251431a..e7c27509a 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -48,13 +48,6 @@ platforms: volumes: - "/sys/fs/cgroup:/sys/fs/cgroup:rw" command: "/usr/sbin/init" - - name: centos-8 - image: centos:8 - dockerfile: ../common/Dockerfile.j2 - privileged: true - volumes: - - "/sys/fs/cgroup:/sys/fs/cgroup:rw" - command: "/usr/sbin/init" - name: debian-buster image: debian:buster-slim dockerfile: ../common/Dockerfile.j2 diff --git a/molecule/downgrade/converge.yml b/molecule/downgrade/converge.yml index ebce729c0..63ff093a6 100644 --- a/molecule/downgrade/converge.yml +++ b/molecule/downgrade/converge.yml @@ -4,15 +4,15 @@ pre_tasks: - name: Set repo if Alpine set_fact: - version: "=1.20.2-r1" + version: "=1.20.3-r1" when: ansible_facts['os_family'] == "Alpine" - name: Set repo if Debian set_fact: - version: "=1.20.2-1~{{ ansible_facts['distribution_release'] }}" + version: "=1.20.3-1~{{ ansible_facts['distribution_release'] }}" when: ansible_facts['os_family'] == "Debian" - name: Set repo if Red Hat set_fact: - version: "-1.20.2-1.{{ (ansible_facts['distribution']=='Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx" + version: "-1.20.3-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/downgrade/molecule.yml b/molecule/downgrade/molecule.yml index ae42aabc7..2e7323f99 100644 --- a/molecule/downgrade/molecule.yml +++ b/molecule/downgrade/molecule.yml @@ -41,13 +41,6 @@ platforms: volumes: - "/sys/fs/cgroup:/sys/fs/cgroup:rw" command: "/usr/sbin/init" - - name: centos-8 - image: centos:8 - dockerfile: ../common/Dockerfile.j2 - privileged: true - volumes: - - "/sys/fs/cgroup:/sys/fs/cgroup:rw" - command: "/usr/sbin/init" - name: debian-buster image: debian:buster-slim dockerfile: ../common/Dockerfile.j2 diff --git a/molecule/downgrade/prepare.yml b/molecule/downgrade/prepare.yml index b1f696713..f9aefb2e3 100644 --- a/molecule/downgrade/prepare.yml +++ b/molecule/downgrade/prepare.yml @@ -4,15 +4,15 @@ pre_tasks: - name: Set repo if Alpine set_fact: - version: "=1.21.4-r1" + version: "=1.21.6-r1" when: ansible_facts['os_family'] == "Alpine" - name: Set repo if Debian set_fact: - version: "=1.21.4-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 set_fact: - version: "-1.21.4-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" - name: Enable NGINX @CentOS-AppStream dnf modules shell: diff --git a/molecule/module/molecule.yml b/molecule/module/molecule.yml index 8a251431a..e7c27509a 100644 --- a/molecule/module/molecule.yml +++ b/molecule/module/molecule.yml @@ -48,13 +48,6 @@ platforms: volumes: - "/sys/fs/cgroup:/sys/fs/cgroup:rw" command: "/usr/sbin/init" - - name: centos-8 - image: centos:8 - dockerfile: ../common/Dockerfile.j2 - privileged: true - volumes: - - "/sys/fs/cgroup:/sys/fs/cgroup:rw" - command: "/usr/sbin/init" - name: debian-buster image: debian:buster-slim dockerfile: ../common/Dockerfile.j2 diff --git a/molecule/plus/molecule.yml b/molecule/plus/molecule.yml index 15dbff08e..8871df83a 100644 --- a/molecule/plus/molecule.yml +++ b/molecule/plus/molecule.yml @@ -48,13 +48,6 @@ platforms: volumes: - "/sys/fs/cgroup:/sys/fs/cgroup:rw" command: "/usr/sbin/init" - - name: centos-8 - image: centos:8 - dockerfile: ../common/Dockerfile.j2 - privileged: true - volumes: - - "/sys/fs/cgroup:/sys/fs/cgroup:rw" - command: "/usr/sbin/init" - name: debian-buster image: debian:buster-slim dockerfile: ../common/Dockerfile.j2 diff --git a/molecule/source/molecule.yml b/molecule/source/molecule.yml index 8a251431a..e7c27509a 100644 --- a/molecule/source/molecule.yml +++ b/molecule/source/molecule.yml @@ -48,13 +48,6 @@ platforms: volumes: - "/sys/fs/cgroup:/sys/fs/cgroup:rw" command: "/usr/sbin/init" - - name: centos-8 - image: centos:8 - dockerfile: ../common/Dockerfile.j2 - privileged: true - volumes: - - "/sys/fs/cgroup:/sys/fs/cgroup:rw" - command: "/usr/sbin/init" - name: debian-buster image: debian:buster-slim dockerfile: ../common/Dockerfile.j2 diff --git a/molecule/uninstall/molecule.yml b/molecule/uninstall/molecule.yml index 46d6c10b6..dbfb4936c 100644 --- a/molecule/uninstall/molecule.yml +++ b/molecule/uninstall/molecule.yml @@ -48,13 +48,6 @@ platforms: volumes: - "/sys/fs/cgroup:/sys/fs/cgroup:rw" command: "/usr/sbin/init" - - name: centos-8 - image: centos:8 - dockerfile: ../common/Dockerfile.j2 - privileged: true - volumes: - - "/sys/fs/cgroup:/sys/fs/cgroup:rw" - command: "/usr/sbin/init" - name: debian-buster image: debian:buster-slim dockerfile: ../common/Dockerfile.j2 diff --git a/molecule/uninstall_plus/molecule.yml b/molecule/uninstall_plus/molecule.yml index 15dbff08e..8871df83a 100644 --- a/molecule/uninstall_plus/molecule.yml +++ b/molecule/uninstall_plus/molecule.yml @@ -48,13 +48,6 @@ platforms: volumes: - "/sys/fs/cgroup:/sys/fs/cgroup:rw" command: "/usr/sbin/init" - - name: centos-8 - image: centos:8 - dockerfile: ../common/Dockerfile.j2 - privileged: true - volumes: - - "/sys/fs/cgroup:/sys/fs/cgroup:rw" - command: "/usr/sbin/init" - name: debian-buster image: debian:buster-slim dockerfile: ../common/Dockerfile.j2 diff --git a/molecule/upgrade/molecule.yml b/molecule/upgrade/molecule.yml index 8ae258c5f..fdb4c6afa 100644 --- a/molecule/upgrade/molecule.yml +++ b/molecule/upgrade/molecule.yml @@ -20,13 +20,6 @@ platforms: volumes: - "/sys/fs/cgroup:/sys/fs/cgroup:rw" command: "/usr/sbin/init" - - name: centos-8 - image: centos:8 - dockerfile: ../common/Dockerfile.j2 - privileged: true - volumes: - - "/sys/fs/cgroup:/sys/fs/cgroup:rw" - command: "/usr/sbin/init" - name: debian-buster image: debian:buster-slim dockerfile: ../common/Dockerfile.j2 diff --git a/molecule/upgrade/prepare.yml b/molecule/upgrade/prepare.yml index 8d0629926..729377a9e 100644 --- a/molecule/upgrade/prepare.yml +++ b/molecule/upgrade/prepare.yml @@ -4,15 +4,15 @@ pre_tasks: - name: Set repo if Alpine set_fact: - version: "=1.21.3-r1" + version: "=1.21.5-r1" when: ansible_facts['os_family'] == "Alpine" - name: Set repo if Debian set_fact: - version: "=1.21.3-1~{{ ansible_facts['distribution_release'] }}" + version: "=1.21.5-1~{{ ansible_facts['distribution_release'] }}" when: ansible_facts['os_family'] == "Debian" - name: Set repo if Red Hat set_fact: - version: "-1.21.3-1.{{ (ansible_facts['distribution']=='Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx" + version: "-1.21.5-1.{{ (ansible_facts['distribution']=='Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx" when: ansible_facts['os_family'] == "RedHat" - name: Enable NGINX @CentOS-AppStream dnf modules shell: diff --git a/molecule/upgrade/verify.yml b/molecule/upgrade/verify.yml index 4664d0548..b32787192 100644 --- a/molecule/upgrade/verify.yml +++ b/molecule/upgrade/verify.yml @@ -24,10 +24,21 @@ url: http://localhost status_code: 200 + - name: Fetch NGINX version + uri: + url: https://version.nginx.com/nginx/mainline + return_content: true + check_mode: false + register: nginx_versions + + - name: Set NGINX version + set_fact: + nginx_version: "{{ nginx_versions.content | regex_search('([0-9]+\\.){2}[0-9]+') }}" + - name: Verify NGINX has been upgraded command: nginx -v args: 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.4') + failed_when: version is not search(nginx_version) From f31d20e73498ec30470d802b98ac197dec3b79a9 Mon Sep 17 00:00:00 2001 From: alessfg Date: Wed, 2 Feb 2022 01:58:46 +0100 Subject: [PATCH 3/4] Revert downgrade molecule scenario --- molecule/downgrade/converge.yml | 6 +++--- molecule/downgrade/prepare.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/molecule/downgrade/converge.yml b/molecule/downgrade/converge.yml index 63ff093a6..ebce729c0 100644 --- a/molecule/downgrade/converge.yml +++ b/molecule/downgrade/converge.yml @@ -4,15 +4,15 @@ pre_tasks: - name: Set repo if Alpine set_fact: - version: "=1.20.3-r1" + version: "=1.20.2-r1" when: ansible_facts['os_family'] == "Alpine" - name: Set repo if Debian set_fact: - version: "=1.20.3-1~{{ ansible_facts['distribution_release'] }}" + version: "=1.20.2-1~{{ ansible_facts['distribution_release'] }}" when: ansible_facts['os_family'] == "Debian" - name: Set repo if Red Hat set_fact: - version: "-1.20.3-1.{{ (ansible_facts['distribution']=='Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx" + version: "-1.20.2-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/downgrade/prepare.yml b/molecule/downgrade/prepare.yml index f9aefb2e3..b1f696713 100644 --- a/molecule/downgrade/prepare.yml +++ b/molecule/downgrade/prepare.yml @@ -4,15 +4,15 @@ pre_tasks: - name: Set repo if Alpine set_fact: - version: "=1.21.6-r1" + version: "=1.21.4-r1" when: ansible_facts['os_family'] == "Alpine" - name: Set repo if Debian set_fact: - version: "=1.21.6-1~{{ ansible_facts['distribution_release'] }}" + version: "=1.21.4-1~{{ ansible_facts['distribution_release'] }}" when: ansible_facts['os_family'] == "Debian" - name: Set repo if Red Hat set_fact: - version: "-1.21.6-1.{{ (ansible_facts['distribution']=='Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx" + version: "-1.21.4-1.{{ (ansible_facts['distribution']=='Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx" when: ansible_facts['os_family'] == "RedHat" - name: Enable NGINX @CentOS-AppStream dnf modules shell: From 52065c74deed535029131e6da10d9b10ffc7bd09 Mon Sep 17 00:00:00 2001 From: alessfg Date: Wed, 2 Feb 2022 14:52:14 +0100 Subject: [PATCH 4/4] 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 d93a4e954..fa5e230d4 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.4') + failed_when: version is not search('1.21.5')