Exclude ubuntu 18.04 from supported OS list

ansible-collections · Jun 30, 2023 · 34edfb3 · 34edfb3
1 parent 67cc042
commit 34edfb3
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 24 deletions.
diff --git 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 }}
+          molecule -c common/molecule.yml test -s ${{ matrix.scenario_name }}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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  |
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		minor_changes:
		- all roles - Exclude ubuntu 18.04 from supported OS list.