Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jun 1, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
decbe19
Remove Centos 7 and Python2 Support
pyrodie18 May 31, 2024
e1d99e2
A few left overs
pyrodie18 May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/javagateway.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
container:
- rockylinux9
- rockylinux8
- centos7
- ubuntu2404
- ubuntu2204
- ubuntu2004
Expand All @@ -32,10 +31,6 @@ jobs:
- v64
- v62
- v60
include:
- interpreter: python3
- interpreter: python
container: centos7
exclude:
- container: debian12
version: v62
Expand Down Expand Up @@ -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 }}
1 change: 0 additions & 1 deletion .github/workflows/proxy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
container:
- rockylinux9
- rockylinux8
- centos7
- ubuntu2404
- ubuntu2204
- ubuntu2004
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/web.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ jobs:
- v64
- v62
- v60
include:
- interpreter: python3
exclude:
- container: ubuntu2404
version: v62
Expand Down Expand Up @@ -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 }}
3 changes: 3 additions & 0 deletions changelogs/fragments/remove_centos7.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
breaking_changes:
- All Roles - Remove support for Centos 7
- All Roles - Remove support for Python2
1 change: 0 additions & 1 deletion docs/ZABBIX_AGENT_ROLE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
1 change: 0 additions & 1 deletion docs/ZABBIX_JAVAGATEWAY_ROLE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
1 change: 0 additions & 1 deletion docs/ZABBIX_PROXY_ROLE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
5 changes: 0 additions & 5 deletions molecule/zabbix_javagateway/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 2 additions & 6 deletions molecule/zabbix_javagateway/prepare.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions molecule/zabbix_proxy/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 1 addition & 5 deletions molecule/zabbix_proxy/prepare.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -79,7 +75,7 @@
name:
- net-tools
- apt-utils
- "{{ zabbix_python_prefix }}-pip"
- python3-pip
- gpg-agent
- sudo
- doc-base
Expand Down
2 changes: 0 additions & 2 deletions molecule/zabbix_server/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 0 additions & 5 deletions molecule/zabbix_web/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ platforms:
groups:
- ${MY_MOLECULE_DATABASE:-mysql}
- ${MY_MOLECULE_VERSION:-v64}
- ${MY_MOLECULE_INTERPRETER:-python3}
- ${MY_MOLECULE_WEB_SERVER:-apache}

provisioner:
Expand All @@ -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
Expand Down
14 changes: 0 additions & 14 deletions roles/zabbix_agent/molecule/with-server/Dockerfile.j2
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions roles/zabbix_agent/molecule/with-server/INSTALL.rst
View file
Open in desktop

This file was deleted.

73 changes: 0 additions & 73 deletions roles/zabbix_agent/molecule/with-server/molecule.yml
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions roles/zabbix_agent/molecule/with-server/playbook.yml
View file
Open in desktop

This file was deleted.

Loading
Loading