Bump ansible-lint from 5.3.1 to 5.3.2 in /.github/workflows/requirements (#481)

This commit is contained in:
dependabot[bot] 2022-02-02 19:01:38 +01:00 committed by GitHub
parent 96a71e1272
commit a4afcec939
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 30 additions and 67 deletions

View File

@ -1,6 +1,6 @@
ansible-core==2.12.1 ansible-core==2.12.1
jinja2==3.0.3 jinja2==3.0.3
ansible-lint==5.3.1 ansible-lint==5.3.2
yamllint==1.26.3 yamllint==1.26.3
molecule[docker]==3.5.2 molecule[docker]==3.5.2
docker==5.0.3 docker==5.0.3

View File

@ -1,5 +1,15 @@
# Changelog # 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) ## 0.22.0 (December 9, 2021)
BREAKING CHANGES: BREAKING CHANGES:

View File

@ -81,7 +81,6 @@ Amazon Linux:
- 2 - 2
CentOS: CentOS:
- 7.4+ - 7.4+
- 8
Debian: Debian:
- buster (10) - buster (10)
- bullseye (11) - bullseye (11)
@ -109,7 +108,6 @@ Amazon Linux 2:
- any - any
CentOS: CentOS:
- 7.4+ - 7.4+
- 8
Debian: Debian:
- buster (10) - buster (10)
- bullseye (11) - bullseye (11)

View File

@ -4,15 +4,15 @@
pre_tasks: pre_tasks:
- name: Set repo if Alpine - name: Set repo if Alpine
set_fact: set_fact:
version: "=1.21.4-r1" version: "=1.21.5-r1"
when: ansible_facts['os_family'] == "Alpine" when: ansible_facts['os_family'] == "Alpine"
- name: Set repo if Debian - name: Set repo if Debian
set_fact: 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" when: ansible_facts['os_family'] == "Debian"
- name: Set repo if Red Hat - name: Set repo if Red Hat
set_fact: 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" when: ansible_facts['os_family'] == "RedHat"
- name: Enable NGINX @CentOS-AppStream dnf modules - name: Enable NGINX @CentOS-AppStream dnf modules
shell: shell:

View File

@ -48,13 +48,6 @@ platforms:
volumes: volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw" - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
command: "/usr/sbin/init" 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 - name: debian-buster
image: debian:buster-slim image: debian:buster-slim
dockerfile: ../common/Dockerfile.j2 dockerfile: ../common/Dockerfile.j2

View File

@ -30,4 +30,4 @@
chdir: "{{ ((ansible_facts['system'] | lower is not search('bsd')) | ternary('/etc/nginx', '/usr/local/sbin')) }}" chdir: "{{ ((ansible_facts['system'] | lower is not search('bsd')) | ternary('/etc/nginx', '/usr/local/sbin')) }}"
changed_when: false changed_when: false
register: version register: version
failed_when: version is not search('1.21.4') failed_when: version is not search('1.21.5')

View File

@ -41,13 +41,6 @@ platforms:
volumes: volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw" - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
command: "/usr/sbin/init" 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 - name: debian-buster
image: debian:buster-slim image: debian:buster-slim
dockerfile: ../common/Dockerfile.j2 dockerfile: ../common/Dockerfile.j2

View File

@ -48,13 +48,6 @@ platforms:
volumes: volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw" - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
command: "/usr/sbin/init" 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 - name: debian-buster
image: debian:buster-slim image: debian:buster-slim
dockerfile: ../common/Dockerfile.j2 dockerfile: ../common/Dockerfile.j2

View File

@ -48,13 +48,6 @@ platforms:
volumes: volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw" - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
command: "/usr/sbin/init" 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 - name: debian-buster
image: debian:buster-slim image: debian:buster-slim
dockerfile: ../common/Dockerfile.j2 dockerfile: ../common/Dockerfile.j2

View File

@ -48,13 +48,6 @@ platforms:
volumes: volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw" - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
command: "/usr/sbin/init" 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 - name: debian-buster
image: debian:buster-slim image: debian:buster-slim
dockerfile: ../common/Dockerfile.j2 dockerfile: ../common/Dockerfile.j2

View File

@ -48,13 +48,6 @@ platforms:
volumes: volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw" - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
command: "/usr/sbin/init" 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 - name: debian-buster
image: debian:buster-slim image: debian:buster-slim
dockerfile: ../common/Dockerfile.j2 dockerfile: ../common/Dockerfile.j2

View File

@ -48,13 +48,6 @@ platforms:
volumes: volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw" - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
command: "/usr/sbin/init" 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 - name: debian-buster
image: debian:buster-slim image: debian:buster-slim
dockerfile: ../common/Dockerfile.j2 dockerfile: ../common/Dockerfile.j2

View File

@ -20,13 +20,6 @@ platforms:
volumes: volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw" - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
command: "/usr/sbin/init" 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 - name: debian-buster
image: debian:buster-slim image: debian:buster-slim
dockerfile: ../common/Dockerfile.j2 dockerfile: ../common/Dockerfile.j2

View File

@ -4,15 +4,15 @@
pre_tasks: pre_tasks:
- name: Set repo if Alpine - name: Set repo if Alpine
set_fact: set_fact:
version: "=1.21.3-r1" version: "=1.21.5-r1"
when: ansible_facts['os_family'] == "Alpine" when: ansible_facts['os_family'] == "Alpine"
- name: Set repo if Debian - name: Set repo if Debian
set_fact: 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" when: ansible_facts['os_family'] == "Debian"
- name: Set repo if Red Hat - name: Set repo if Red Hat
set_fact: 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" when: ansible_facts['os_family'] == "RedHat"
- name: Enable NGINX @CentOS-AppStream dnf modules - name: Enable NGINX @CentOS-AppStream dnf modules
shell: shell:

View File

@ -24,10 +24,21 @@
url: http://localhost url: http://localhost
status_code: 200 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 - name: Verify NGINX has been upgraded
command: nginx -v command: nginx -v
args: args:
chdir: "{{ ((ansible_facts['system'] | lower is not search('bsd')) | ternary('/etc/nginx', '/usr/local/sbin')) }}" chdir: "{{ ((ansible_facts['system'] | lower is not search('bsd')) | ternary('/etc/nginx', '/usr/local/sbin')) }}"
changed_when: false changed_when: false
register: version register: version
failed_when: version is not search('1.21.4') failed_when: version is not search(nginx_version)