🔥 Drop Ubuntu 18.04 support and hack CI

master 1.10.0
Emilien Mantel 2023-05-31 12:00:01 +02:00 committed by Emilien M
parent c61fb86cc0
commit a5325d7d54
5 changed files with 14 additions and 30 deletions

View File

@ -11,7 +11,6 @@ name: Molecule
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
continue-on-error: ${{ matrix.allowed-to-fail }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -19,7 +18,6 @@ jobs:
- debian-10 - debian-10
- debian-11 - debian-11
- debian-12 - debian-12
- ubuntu-18.04
- ubuntu-22.04 - ubuntu-22.04
allowed-to-fail: allowed-to-fail:
- false - false
@ -39,3 +37,7 @@ jobs:
molecule_options: --base-config molecule/_shared/base.yml molecule_options: --base-config molecule/_shared/base.yml
molecule_args: --scenario-name ${{ matrix.scenario }} molecule_args: --scenario-name ${{ matrix.scenario }}
molecule_working_dir: "HanXHX/ansible-nginx" molecule_working_dir: "HanXHX/ansible-nginx"
continue-on-error: ${{ matrix.allowed-to-fail }}
- name: Fake command
run: echo "End of job"

View File

@ -29,7 +29,6 @@ Supported OS:
| Debian Bookworm (12) | Yes | Not yet :) | | Debian Bookworm (12) | Yes | Not yet :) |
| FreeBSD 11 | NA | No | | FreeBSD 11 | NA | No |
| FreeBSD 12 | NA | No | | FreeBSD 12 | NA | No |
| Ubuntu 18.04 | Yes | Yes |
| Ubuntu 20.04 | Yes | Yes | | Ubuntu 20.04 | Yes | Yes |
| Ubuntu 22.04 | Yes | Yes | | Ubuntu 22.04 | Yes | Yes |

View File

@ -16,7 +16,6 @@ galaxy_info:
- bookworm - bookworm
- name: Ubuntu - name: Ubuntu
versions: versions:
- bionic
- focal - focal
- jammy - jammy
- name: FreeBSD - name: FreeBSD

View File

@ -1,13 +0,0 @@
---
platforms:
- name: ubuntu-18.04
image: dokken/ubuntu-18.04
command: /lib/systemd/systemd
dockerfile: ../_shared/Dockerfile.j2
capabilities:
- SYS_ADMIN
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
privileged: true

View File

@ -240,20 +240,17 @@
# -------------------------------- # --------------------------------
# Check Proxy protocol # Check Proxy protocol
# -------------------------------- # --------------------------------
- name: BLOCK - Check proxy protocol - name: SHELL | Check HTTP proxy protocol
when: not (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version | int == 18) ansible.builtin.shell: set -o pipefail && curl -I --haproxy-protocol http://test-ssl-proxy-protocol.local:20080 | grep -qi 'X-Proxy-Protocol'
block: args:
- name: SHELL | Check HTTP proxy protocol executable: /bin/bash
ansible.builtin.shell: set -o pipefail && curl -I --haproxy-protocol http://test-ssl-proxy-protocol.local:20080 | grep -qi 'X-Proxy-Protocol' changed_when: false
args:
executable: /bin/bash
changed_when: false
- name: SHELL | Check HTTPS proxy protocol - name: SHELL | Check HTTPS proxy protocol
ansible.builtin.shell: set -o pipefail && curl -I --haproxy-protocol -k https://test-ssl-proxy-protocol.local:20443 | grep -qi 'X-Proxy-Protocol' ansible.builtin.shell: set -o pipefail && curl -I --haproxy-protocol -k https://test-ssl-proxy-protocol.local:20443 | grep -qi 'X-Proxy-Protocol'
args: args:
executable: /bin/bash executable: /bin/bash
changed_when: false changed_when: false
# -------------------------------- # --------------------------------
# Check HTTP2 # Check HTTP2