From 34edfb3a43f501294ef01c4d227b1776762b2f90 Mon Sep 17 00:00:00 2001 From: ONODERA Date: Fri, 30 Jun 2023 04:43:12 +0100 Subject: [PATCH] Exclude ubuntu 18.04 from supported OS list --- .github/workflows/agent.yml | 3 +-- .github/workflows/javagateway.yml | 1 - .github/workflows/proxy.yml | 1 - .github/workflows/server.yml | 5 ----- .github/workflows/web.yml | 5 ----- changelogs/1026-exclude_ubuntu18.yml | 2 ++ docs/ZABBIX_AGENT_ROLE.md | 1 - docs/ZABBIX_JAVAGATEWAY_ROLE.md | 3 +-- docs/ZABBIX_PROXY_ROLE.md | 3 +-- docs/ZABBIX_SERVER_ROLE.md | 7 +++---- docs/ZABBIX_WEB_ROLE.md | 1 - 11 files changed, 8 insertions(+), 24 deletions(-) create mode 100644 changelogs/1026-exclude_ubuntu18.yml diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml index ccbce84be..5e8343689 100644 --- a/.github/workflows/agent.yml +++ b/.github/workflows/agent.yml @@ -24,7 +24,6 @@ jobs: - rockylinux8 - ubuntu2204 - ubuntu2004 - - ubuntu1804 - debian11 - debian10 version: @@ -69,4 +68,4 @@ jobs: MY_MOLECULE_IMAGE=${{ matrix.container }} MY_MOLECULE_VERSION=${{ matrix.version }} MY_MOLECULE_DOCKER_COMMAND=${{ matrix.command }} - molecule -c common/molecule.yml test -s ${{ matrix.scenario_name }} \ No newline at end of file + molecule -c common/molecule.yml test -s ${{ matrix.scenario_name }} diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml index 855a9dccd..8ad8ce17a 100644 --- a/.github/workflows/javagateway.yml +++ b/.github/workflows/javagateway.yml @@ -25,7 +25,6 @@ jobs: - centos7 - ubuntu2204 - ubuntu2004 - - ubuntu1804 - debian11 - debian10 version: diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml index 0644944de..a7441bbc0 100644 --- a/.github/workflows/proxy.yml +++ b/.github/workflows/proxy.yml @@ -25,7 +25,6 @@ jobs: - centos7 - ubuntu2204 - ubuntu2004 - - ubuntu1804 - debian11 - debian10 collection_role: diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index 3cc50e0d3..d7e2372fe 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -24,7 +24,6 @@ jobs: - rockylinux8 - ubuntu2204 - ubuntu2004 - - ubuntu1804 - debian11 - debian10 collection_role: @@ -41,10 +40,6 @@ jobs: exclude: - container: debian10 version: v62 - - container: ubuntu1804 - version: v62 - - container: ubuntu1804 - version: v64 - container: debian10 version: v64 steps: diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml index 7ca1df415..b0e9e1e21 100644 --- a/.github/workflows/web.yml +++ b/.github/workflows/web.yml @@ -24,7 +24,6 @@ jobs: - rockylinux8 - ubuntu2204 - ubuntu2004 - - ubuntu1804 - debian11 - debian10 collection_role: @@ -43,12 +42,8 @@ jobs: exclude: - container: debian10 version: v62 - - container: ubuntu1804 - version: v62 - container: debian10 version: v64 - - container: ubuntu1804 - version: v64 steps: - name: Check out code uses: actions/checkout@v1 diff --git a/changelogs/1026-exclude_ubuntu18.yml b/changelogs/1026-exclude_ubuntu18.yml new file mode 100644 index 000000000..fe39edf30 --- /dev/null +++ b/changelogs/1026-exclude_ubuntu18.yml @@ -0,0 +1,2 @@ +minor_changes: + - all roles - Exclude ubuntu 18.04 from supported OS list. diff --git a/docs/ZABBIX_AGENT_ROLE.md b/docs/ZABBIX_AGENT_ROLE.md index 0742eec70..a7f72e405 100644 --- a/docs/ZABBIX_AGENT_ROLE.md +++ b/docs/ZABBIX_AGENT_ROLE.md @@ -97,7 +97,6 @@ See the following list of supported Operating systems with the Zabbix releases: | Red Hat Fam 7 | V | V | V | | Ubuntu 22.04 jammy | V | V | V | | Ubuntu 20.04 focal | V | V | V | -| Ubuntu 18.04 bionic | V | V | V | | Debian 11 bullseye | V | V | V | | Debian 10 buster | V | V | V | diff --git a/docs/ZABBIX_JAVAGATEWAY_ROLE.md b/docs/ZABBIX_JAVAGATEWAY_ROLE.md index 408747ed7..2b9f27e24 100644 --- a/docs/ZABBIX_JAVAGATEWAY_ROLE.md +++ b/docs/ZABBIX_JAVAGATEWAY_ROLE.md @@ -41,7 +41,6 @@ See the following list of supported Operating systems with the Zabbix releases. | Red Hat Fam 7 | V | V | V | | Ubuntu 22.04 jammy | V | V | V | | Ubuntu 20.04 focal | V | V | V | -| Ubuntu 18.04 bionic | V | V | V | | Debian 11 bullseye | V | V | V | | Debian 10 buster | V | V | V | @@ -119,7 +118,7 @@ Including an example of how to use your role (for instance, with variables passe # Molecule -This role is configured to be tested with Molecule. You can find on this page some more information regarding Molecule: +This role is configured to be tested with Molecule. You can find on this page some more information regarding Molecule: * http://werner-dijkerman.nl/2016/07/10/testing-ansible-roles-with-molecule-testinfra-and-docker/ * http://werner-dijkerman.nl/2016/07/27/extending-ansible-role-testing-with-molecule-by-adding-group_vars-dependencies-and-using-travis-ci/ diff --git a/docs/ZABBIX_PROXY_ROLE.md b/docs/ZABBIX_PROXY_ROLE.md index 0d6ecc5b4..3cc31c2ab 100644 --- a/docs/ZABBIX_PROXY_ROLE.md +++ b/docs/ZABBIX_PROXY_ROLE.md @@ -84,7 +84,6 @@ See the following list of supported Operating systems with the Zabbix releases. | Red Hat Fam 7 | V | V | V | | Ubuntu 22.04 jammy | V | V | V | | Ubuntu 20.04 focal | V | V | V | -| Ubuntu 18.04 bionic | V | V | V | | Debian 11 bullseye | V | V | V | | Debian 10 buster | V | V | V | @@ -416,7 +415,7 @@ Including an example of how to use your role (for instance, with variables passe # Molecule -This role is configured to be tested with Molecule. You can find on this page some more information regarding Molecule: +This role is configured to be tested with Molecule. You can find on this page some more information regarding Molecule: * http://werner-dijkerman.nl/2016/07/10/testing-ansible-roles-with-molecule-testinfra-and-docker/ * http://werner-dijkerman.nl/2016/07/27/extending-ansible-role-testing-with-molecule-by-adding-group_vars-dependencies-and-using-travis-ci/ diff --git a/docs/ZABBIX_SERVER_ROLE.md b/docs/ZABBIX_SERVER_ROLE.md index 6c4407d26..5c2eddb7a 100644 --- a/docs/ZABBIX_SERVER_ROLE.md +++ b/docs/ZABBIX_SERVER_ROLE.md @@ -81,7 +81,6 @@ See the following list of supported Operating systems with the Zabbix releases: | Red Hat Fam 8 | V | V | V | | Ubuntu 22.04 jammy | V | V | V | | Ubuntu 20.04 focal | V | V | V | -| Ubuntu 18.04 bionic | | | V | | Debian 11 bullseye | V | V | V | | Debian 10 buster | | | V | @@ -110,8 +109,8 @@ The following is an overview of all available configuration default for this rol ### SElinux * `zabbix_server_selinux`: Default: `False`. Enables an SELinux policy so that the server will run. -* `selinux_allow_zabbix_can_network`: Default: `False`. -* `selinux_allow_zabbix_can_http`: Default: `False`. +* `selinux_allow_zabbix_can_network`: Default: `False`. +* `selinux_allow_zabbix_can_http`: Default: `False`. ### Zabbix Server @@ -415,7 +414,7 @@ Including an example of how to use your role (for instance, with variables passe # Molecule -This role is configured to be tested with Molecule. You can find on this page some more information regarding Molecule: +This role is configured to be tested with Molecule. You can find on this page some more information regarding Molecule: * http://werner-dijkerman.nl/2016/07/10/testing-ansible-roles-with-molecule-testinfra-and-docker/ * http://werner-dijkerman.nl/2016/07/27/extending-ansible-role-testing-with-molecule-by-adding-group_vars-dependencies-and-using-travis-ci/ diff --git a/docs/ZABBIX_WEB_ROLE.md b/docs/ZABBIX_WEB_ROLE.md index 800795902..fd81a9539 100644 --- a/docs/ZABBIX_WEB_ROLE.md +++ b/docs/ZABBIX_WEB_ROLE.md @@ -60,7 +60,6 @@ See the following list of supported Operating Systems with the Zabbix releases. | Red Hat Fam 8 | V | V | V | | Ubuntu 22.04 jammy | V | V | V | | Ubuntu 20.04 focal | V | V | V | -| Ubuntu 18.04 bionic | | | V | | Debian 11 bullseye | V | V | V | | Debian 10 buster | | | V |