Remove Support for Centos 7 and Python 2.X (#1260)

ansible-collections · Jun 1, 2024 · c79390c · c79390c
1 parent 07c004e
commit c79390c
Show file tree

Hide file tree

Showing 30 changed files with 9 additions and 444 deletions.
diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
@@ -22,7 +22,6 @@ jobs:
         container:
           - rockylinux9
           - rockylinux8
-          - centos7
           - ubuntu2404
           - ubuntu2204
           - ubuntu2004
@@ -32,10 +31,6 @@ jobs:
           - v64
           - v62
           - v60
-        include:
-          - interpreter: python3
-          - interpreter: python
-            container: centos7
         exclude:
           - container: debian12
             version: v62
@@ -79,5 +74,4 @@ jobs:
           MY_MOLECULE_IMAGE=${{ matrix.container }}
           MY_MOLECULE_VERSION=${{ matrix.version }}
           MY_MOLECULE_DOCKER_COMMAND=${{ matrix.command }}
-          MY_MOLECULE_INTERPRETER=${{ matrix.interpreter }}
           molecule test -s ${{ matrix.collection_role }}
diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
@@ -22,7 +22,6 @@ jobs:
         container:
           - rockylinux9
           - rockylinux8
-          - centos7
           - ubuntu2404
           - ubuntu2204
           - ubuntu2004

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -39,8 +39,6 @@ jobs:
           - v64
           - v62
           - v60
-        include:
-          - interpreter: python3
         exclude:
           - container: ubuntu2404
             version: v62
@@ -83,6 +81,5 @@ jobs:
           MY_MOLECULE_VERSION=${{ matrix.version }}
           MY_MOLECULE_DATABASE=${{ matrix.database }}
           MY_MOLECULE_WEB_SERVER=${{ matrix.web_server }}
-          MY_MOLECULE_INTERPRETER=${{ matrix.interpreter }}
           MY_MOLECULE_DOCKER_COMMAND=${{ matrix.command }}
           molecule test -s ${{ matrix.collection_role }}
diff --git a/changelogs/fragments/remove_centos7.yml b/changelogs/fragments/remove_centos7.yml
@@ -0,0 +1,3 @@
+breaking_changes:
+  - All Roles - Remove support for Centos 7
+  - All Roles - Remove support for Python2
diff --git a/docs/ZABBIX_AGENT_ROLE.md b/docs/ZABBIX_AGENT_ROLE.md
@@ -93,7 +93,6 @@ See the following list of supported Operating systems with the Zabbix releases:
 |---------------------|-----|-----|-----|
 | Red Hat Fam 9       |  V  |  V  |  V  |
 | Red Hat Fam 8       |  V  |  V  |  V  |
-| Red Hat Fam 7       |  V  |  V  |  V  |
 | Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |

diff --git a/docs/ZABBIX_JAVAGATEWAY_ROLE.md b/docs/ZABBIX_JAVAGATEWAY_ROLE.md
@@ -38,7 +38,6 @@ See the following list of supported Operating systems with the Zabbix releases.
 |---------------------|-----|-----|-----|
 | Red Hat Fam 9       |  V  |  V  |  V  |
 | Red Hat Fam 8       |  V  |  V  |  V  |
-| Red Hat Fam 7       |  V  |  V  |  V  |
 | Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |

diff --git a/docs/ZABBIX_PROXY_ROLE.md b/docs/ZABBIX_PROXY_ROLE.md
@@ -81,7 +81,6 @@ See the following list of supported Operating systems with the Zabbix releases.
 |---------------------|-----|-----|-----|
 | Red Hat Fam 9       |  V  |  V  |  V  |
 | Red Hat Fam 8       |  V  |  V  |  V  |
-| Red Hat Fam 7       |  V  |  V  |  V  |
 | Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |

diff --git a/molecule/zabbix_javagateway/molecule.yml b/molecule/zabbix_javagateway/molecule.yml
@@ -14,18 +14,13 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - ${MY_MOLECULE_VERSION:-v64}
-      - ${MY_MOLECULE_INTERPRETER:-python3}
 provisioner:
   name: ansible
   env:
     ANSIBLE_COLLECTIONS_PATHS: $HOME/.ansible/collections/ansible_collections/community/zabbix
     ANSIBLE_ROLES_PATH: $HOME/.ansible/collections/ansible_collections/community/zabbix/roles
   inventory:
     group_vars:
-      python3:
-        ansible_python_interpreter: /usr/bin/python3
-      python:
-        ansible_python_interpreter: /usr/bin/python
       v64:
         zabbix_javagateway_version: 6.4
       v62:

diff --git a/molecule/zabbix_javagateway/prepare.yml b/molecule/zabbix_javagateway/prepare.yml
@@ -2,10 +2,6 @@
 - name: Prepare
   hosts: all
   pre_tasks:
-    - name: "Set short version name"
-      ansible.builtin.set_fact:
-        zabbix_python_prefix: "python{% if ansible_python_version is version('3', '>=') %}3{% endif %}"
-
     - name: "Installing packages on CentOS"
       ansible.builtin.yum:
         name:
@@ -47,9 +43,9 @@
           - net-tools
           - apt-utils
           - procps
-          - "{{ zabbix_python_prefix }}-pip"
+          - python3-pip
           - gpg-agent
-          - "{{ zabbix_python_prefix }}-apt"
+          - python3-apt
           - sudo
           - software-properties-common
         update_cache: true

diff --git a/molecule/zabbix_proxy/molecule.yml b/molecule/zabbix_proxy/molecule.yml
@@ -23,8 +23,6 @@ provisioner:
     ANSIBLE_ROLES_PATH: $HOME/.ansible/collections/ansible_collections/community/zabbix/roles
   inventory:
     group_vars:
-      all:
-        ansible_python_interpreter: /usr/bin/python3
       v64:
         zabbix_proxy_version: 6.4
       v62:

diff --git a/molecule/zabbix_proxy/prepare.yml b/molecule/zabbix_proxy/prepare.yml
@@ -36,10 +36,6 @@
 - name: Prepare
   hosts: all
   tasks:
-    - name: "Set short version name"
-      ansible.builtin.set_fact:
-        zabbix_python_prefix: "python{% if ansible_python_version is version('3', '>=') %}3{% endif %}"
-
     - name: "Create group for imaginary host"
       add_host:
         name: imaginary-host
@@ -79,7 +75,7 @@
         name:
           - net-tools
           - apt-utils
-          - "{{ zabbix_python_prefix }}-pip"
+          - python3-pip
           - gpg-agent
           - sudo
           - doc-base

diff --git a/molecule/zabbix_server/molecule.yml b/molecule/zabbix_server/molecule.yml
@@ -22,8 +22,6 @@ provisioner:
     ANSIBLE_ROLES_PATH: $HOME/.ansible/collections/ansible_collections/community/zabbix/roles
   inventory:
     group_vars:
-      all:
-        ansible_python_interpreter: /usr/bin/python3
       v64:
         zabbix_server_version: 6.4
       v62:

diff --git a/molecule/zabbix_web/molecule.yml b/molecule/zabbix_web/molecule.yml
@@ -22,7 +22,6 @@ platforms:
     groups:
       - ${MY_MOLECULE_DATABASE:-mysql}
       - ${MY_MOLECULE_VERSION:-v64}
-      - ${MY_MOLECULE_INTERPRETER:-python3}
       - ${MY_MOLECULE_WEB_SERVER:-apache}
 
 provisioner:
@@ -34,10 +33,6 @@ provisioner:
     group_vars:
       all:
         zabbix_api_server_url: zabbix-web-${MY_MOLECULE_VERSION:-v64}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux8}
-      python3:
-        ansible_python_interpreter: /usr/bin/python3
-      python:
-        ansible_python_interpreter: /usr/bin/python
       v64:
         zabbix_server_version: 6.4
         zabbix_web_version: 6.4

diff --git a/roles/zabbix_agent/molecule/with-server/Dockerfile.j2 b/roles/zabbix_agent/molecule/with-server/Dockerfile.j2
diff --git a/roles/zabbix_agent/molecule/with-server/INSTALL.rst b/roles/zabbix_agent/molecule/with-server/INSTALL.rst
diff --git a/roles/zabbix_agent/molecule/with-server/molecule.yml b/roles/zabbix_agent/molecule/with-server/molecule.yml
diff --git a/roles/zabbix_agent/molecule/with-server/playbook.yml b/roles/zabbix_agent/molecule/with-server/playbook.yml