From 655de8d9ca208cf7af159984ba626dfc48751e24 Mon Sep 17 00:00:00 2001 From: Vitaliy Kukharik <37010174+vitabaks@users.noreply.github.com> Date: Tue, 7 Nov 2023 15:03:15 +0300 Subject: [PATCH] Remove compatibility with Ubuntu 18.04 (#495) --- .github/workflows/molecule.yml | 3 -- .github/workflows/molecule_pgpro.yml | 1 - .github/workflows/schedule_pg_ubuntu1804.yml | 32 -------------------- README.md | 1 - group_vars/all | 2 +- vars/Debian.yml | 1 - 6 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 .github/workflows/schedule_pg_ubuntu1804.yml diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index fb1c55180..609200d53 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -31,9 +31,6 @@ jobs: - distro: ubuntu2004 tag: latest namespace: geerlingguy - - distro: ubuntu1804 - tag: latest - namespace: geerlingguy - distro: rockylinux8 tag: latest namespace: geerlingguy diff --git a/.github/workflows/molecule_pgpro.yml b/.github/workflows/molecule_pgpro.yml index bcc07ec13..07c4e093c 100644 --- a/.github/workflows/molecule_pgpro.yml +++ b/.github/workflows/molecule_pgpro.yml @@ -15,7 +15,6 @@ jobs: - centos8 - debian10 - debian11 - - ubuntu1804 - ubuntu2004 - ubuntu2204 diff --git a/.github/workflows/schedule_pg_ubuntu1804.yml b/.github/workflows/schedule_pg_ubuntu1804.yml deleted file mode 100644 index 46d745ee7..000000000 --- a/.github/workflows/schedule_pg_ubuntu1804.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -name: scheduled PostgreSQL (Ubuntu 18.04) - -on: - schedule: - - cron: "30 0 * * *" - -jobs: - test: - runs-on: ubuntu-latest - - steps: - - name: Set TERM environment variable - run: echo "TERM=xterm" >> $GITHUB_ENV - - - name: Checkout - uses: actions/checkout@v3 - - - name: Set up Python 3.10 - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - - name: Install dependencies - run: make bootstrap-dev - - - name: Run Molecule tests - run: make molecule-test - env: - PY_COLORS: "1" - ANSIBLE_FORCE_COLOR: "1" - IMAGE_DISTRO: ubuntu1804 diff --git a/README.md b/README.md index e78b93ed9..8372ee8f8 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,6 @@ _Table of results of daily automated testing of cluster deployment:_ | Debian 10 | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_debian10.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_debian10.yml) | | Debian 11 | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_debian11.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_debian11.yml) | | Debian 12 | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_debian11.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_debian12.yml) | -| Ubuntu 18.04 | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_ubuntu1804.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_ubuntu1804.yml) | | Ubuntu 20.04 | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_ubuntu2004.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_ubuntu2004.yml) | | Ubuntu 22.04 | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_ubuntu2204.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_ubuntu2204.yml) | | CentOS Stream 8 | [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/vitabaks/postgresql_cluster/schedule_pg_centosstream8.yml?branch=master)](https://github.com/vitabaks/postgresql_cluster/actions/workflows/schedule_pg_centosstream8.yml) | diff --git a/group_vars/all b/group_vars/all index 4b558d62b..2398199e3 100644 --- a/group_vars/all +++ b/group_vars/all @@ -15,6 +15,6 @@ os_minimum_versions: CentOS: 7 Rocky: 8.4 OracleLinux: 7 - Ubuntu: 18.04 + Ubuntu: 20.04 Debian: 10 AlmaLinux: 8.3 diff --git a/vars/Debian.yml b/vars/Debian.yml index 8c47c45f7..3a3952945 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -31,7 +31,6 @@ os_specific_packages: Debian-10: [python, python-dev, python-psycopg2, python-setuptools] Debian-11: [python3] # python 2 is not required Debian-12: [python3] # python 2 is not required - Ubuntu-18: [python, python-dev, python-psycopg2, python-setuptools] Ubuntu-20: [python3] # python 2 is not required Ubuntu-22: [python3] # python 2 is not required system_packages: