Remove Debian 10 Support (#1256)

ansible-collections · May 31, 2024 · 9685edb · 9685edb
1 parent 9419ee5
commit 9685edb
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 40 deletions.
diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
@@ -28,7 +28,6 @@ jobs:
           - ubuntu1804
           - debian12
           - debian11
-          - debian10
         version:
           - v64
           - v62

diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
@@ -29,7 +29,6 @@ jobs:
           - ubuntu1804
           - debian12
           - debian11
-          - debian10
         version:
           - v64
           - v62

diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
@@ -29,7 +29,6 @@ jobs:
           - ubuntu1804
           - debian12
           - debian11
-          - debian10
         collection_role:
           - zabbix_proxy
         database:

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -28,7 +28,6 @@ jobs:
           - ubuntu1804
           - debian12
           - debian11
-          - debian10
         collection_role:
           - zabbix_server
         database:
@@ -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

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -28,7 +28,6 @@ jobs:
           - ubuntu1804
           - debian12
           - debian11
-          - debian10
         collection_role:
           - zabbix_web
         database:
@@ -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

diff --git a/changelogs/fragments/remove_deb10.yml b/changelogs/fragments/remove_deb10.yml
@@ -0,0 +1,2 @@
+breaking_changes:
+  - All Roles - Removed support for Debian 10.
diff --git a/docs/ZABBIX_AGENT_ROLE.md b/docs/ZABBIX_AGENT_ROLE.md
@@ -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`
 

diff --git a/docs/ZABBIX_JAVAGATEWAY_ROLE.md b/docs/ZABBIX_JAVAGATEWAY_ROLE.md
@@ -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`
 

diff --git a/docs/ZABBIX_PROXY_ROLE.md b/docs/ZABBIX_PROXY_ROLE.md
@@ -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`
 

diff --git a/docs/ZABBIX_SERVER_ROLE.md b/docs/ZABBIX_SERVER_ROLE.md
@@ -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`
 

diff --git a/docs/ZABBIX_WEB_ROLE.md b/docs/ZABBIX_WEB_ROLE.md
@@ -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`
 

diff --git a/molecule/zabbix_agent_tests/common/playbooks/prepare.yml b/molecule/zabbix_agent_tests/common/playbooks/prepare.yml
@@ -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
@@ -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

diff --git a/roles/zabbix_agent/vars/Debian.yml b/roles/zabbix_agent/vars/Debian.yml
@@ -15,11 +15,6 @@ zabbix_valid_agent_versions:
     - 6.2
     - 6.0
 
-  "10":
-    - 6.4
-    - 6.2
-    - 6.0
-
   "9":
     - 6.4
     - 6.2

diff --git a/roles/zabbix_javagateway/vars/Debian.yml b/roles/zabbix_javagateway/vars/Debian.yml
@@ -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

diff --git a/roles/zabbix_proxy/vars/Debian.yml b/roles/zabbix_proxy/vars/Debian.yml
@@ -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
@@ -39,9 +35,6 @@ _zabbix_proxy_mysql_dependencies:
   "11":
     - default-mysql-client
     - python3-pymysql
-  "10":
-    - mariadb-client
-    - python3-pymysql
   # Ubuntu
   "24":
     - default-mysql-client

diff --git a/roles/zabbix_server/vars/Debian.yml b/roles/zabbix_server/vars/Debian.yml
@@ -14,8 +14,6 @@ zabbix_valid_server_versions:
     - 6.4
     - 6.2
     - 6.0
-  "10":
-    - 6.0
   # Ubuntu
   "24":
     - 6.4

diff --git a/roles/zabbix_web/vars/Debian.yml b/roles/zabbix_web/vars/Debian.yml
@@ -32,8 +32,6 @@ zabbix_valid_web_versions:
     - 6.4
     - 6.2
     - 6.0
-  "10":
-    - 6.0
   # Ubuntu
   "24":
     - 6.4
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		breaking_changes:
		- All Roles - Removed support for Debian 10.
-Original file 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 @@