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.

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 Debian 10 Support #1256

Merged
merged 2 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/workflows/agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
- ubuntu1804
- debian12
- debian11
- debian10
version:
- v64
- v62
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/javagateway.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
- ubuntu1804
- debian12
- debian11
- debian10
version:
- v64
- v62
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
- ubuntu1804
- debian12
- debian11
- debian10
collection_role:
- zabbix_proxy
database:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
- ubuntu1804
- debian12
- debian11
- debian10
collection_role:
- zabbix_server
database:
Expand All @@ -41,16 +40,12 @@ jobs:
exclude:
- container: debian12
version: v62
- container: debian10
version: v62
- container: ubuntu2404
version: v62
- container: ubuntu1804
version: v62
- container: ubuntu1804
version: v64
- container: debian10
version: v64
steps:
- name: Check out code
uses: actions/checkout@v4
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
- ubuntu1804
- debian12
- debian11
- debian10
collection_role:
- zabbix_web
database:
Expand All @@ -44,14 +43,10 @@ jobs:
include:
- interpreter: python3
exclude:
- container: debian10
version: v62
- container: ubuntu2404
version: v62
- container: ubuntu1804
version: v62
- container: debian10
version: v64
- container: ubuntu1804
version: v64
- container: debian12
Expand Down
2 changes: 2 additions & 0 deletions changelogs/fragments/remove_deb10.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
breaking_changes:
- All Roles - Removed support for Debian 10.
1 change: 0 additions & 1 deletion docs/ZABBIX_AGENT_ROLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ See the following list of supported Operating systems with the Zabbix releases:
| Ubuntu 18.04 bionic | V | V | V |
| Debian 12 bookworm | V | V | V |
| Debian 11 bullseye | V | V | V |
| Debian 10 buster | V | V | V |

You can bypass this matrix by setting `enable_version_check: false`

Expand Down
1 change: 0 additions & 1 deletion docs/ZABBIX_JAVAGATEWAY_ROLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ See the following list of supported Operating systems with the Zabbix releases.
| Ubuntu 18.04 bionic | V | V | V |
| Debian 12 bookworm | V | | V |
| Debian 11 bullseye | V | V | V |
| Debian 10 buster | V | V | V |

You can bypass this matrix by setting `enable_version_check: false`

Expand Down
1 change: 0 additions & 1 deletion docs/ZABBIX_PROXY_ROLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ See the following list of supported Operating systems with the Zabbix releases.
| Ubuntu 18.04 bionic | V | V | V |
| Debian 12 bookworm | V | | V |
| Debian 11 bullseye | V | V | V |
| Debian 10 buster | V | V | V |

You can bypass this matrix by setting `enable_version_check: false`

Expand Down
1 change: 0 additions & 1 deletion docs/ZABBIX_SERVER_ROLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ See the following list of supported Operating systems with the Zabbix releases:
| Ubuntu 18.04 bionic | | | V |
| Debian 12 bookworm | V | | V |
| Debian 11 bullseye | V | V | V |
| Debian 10 buster | | | V |

You can bypass this matrix by setting `enable_version_check: false`

Expand Down
1 change: 0 additions & 1 deletion docs/ZABBIX_WEB_ROLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ See the following list of supported Operating Systems with the Zabbix releases.
| Ubuntu 18.04 bionic | | | V |
| Debian 12 bookworm | V | | V |
| Debian 11 bullseye | V | V | V |
| Debian 10 buster | | | V |

You can bypass this matrix by setting `enable_version_check: false`

Expand Down
4 changes: 2 additions & 2 deletions molecule/zabbix_agent_tests/common/playbooks/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
- name: "Installing packages on Debian family"
ansible.builtin.apt:
name:
- "{{ 'net-tools' if ansible_distribution_major_version not in ['10','18', '20'] else 'iproute2' }}"
- "{{ 'net-tools' if ansible_distribution_major_version not in ['18', '20'] else 'iproute2' }}"
state: present
update_cache: true
register: zabbix_agent_prepare_packages_install
Expand All @@ -47,7 +47,7 @@
hosts: docker
tasks:
- name: "Download Docker CE repo file"
when: not ansible_check_mode # Because get_url always has changed status in check_mode.
when: not ansible_check_mode # Because get_url always has changed status in check_mode.
ansible.builtin.get_url:
url: https://download.docker.com/linux/centos/docker-ce.repo
dest: /etc/yum.repos.d/docker-ce.repo
Expand Down
5 changes: 0 additions & 5 deletions roles/zabbix_agent/vars/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ zabbix_valid_agent_versions:
- 6.2
- 6.0

"10":
- 6.4
- 6.2
- 6.0

"9":
- 6.4
- 6.2
Expand Down
5 changes: 1 addition & 4 deletions roles/zabbix_javagateway/vars/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ zabbix_valid_javagateway_versions:
- 6.4
- 6.2
- 6.0
"10":
- 6.4
- 6.2
- 6.0

# Ubuntu
"24":
- 6.4
Expand Down
7 changes: 0 additions & 7 deletions roles/zabbix_proxy/vars/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ zabbix_valid_proxy_versions:
- 6.4
- 6.2
- 6.0
"10":
- 6.4
- 6.2
- 6.0
"24":
- 6.4
- 6.0
Expand Down Expand Up @@ -39,9 +35,6 @@ _zabbix_proxy_mysql_dependencies:
"11":
- default-mysql-client
- python3-pymysql
"10":
- mariadb-client
- python3-pymysql
# Ubuntu
"24":
- default-mysql-client
Expand Down
2 changes: 0 additions & 2 deletions roles/zabbix_server/vars/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ zabbix_valid_server_versions:
- 6.4
- 6.2
- 6.0
"10":
- 6.0
# Ubuntu
"24":
- 6.4
Expand Down
2 changes: 0 additions & 2 deletions roles/zabbix_web/vars/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ zabbix_valid_web_versions:
- 6.4
- 6.2
- 6.0
"10":
- 6.0
# Ubuntu
"24":
- 6.4
Expand Down
Loading