Remove Support for Ubuntu 18.04 (#1257)

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

Hide file tree

Showing 18 changed files with 4 additions and 52 deletions.
diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
@@ -25,7 +25,6 @@ jobs:
           - ubuntu2404
           - ubuntu2204
           - ubuntu2004
-          - ubuntu1804
           - debian12
           - debian11
         version:

diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
@@ -26,7 +26,6 @@ jobs:
           - ubuntu2404
           - ubuntu2204
           - ubuntu2004
-          - ubuntu1804
           - debian12
           - debian11
         version:

diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
@@ -26,7 +26,6 @@ jobs:
           - ubuntu2404
           - ubuntu2204
           - ubuntu2004
-          - ubuntu1804
           - debian12
           - debian11
         collection_role:

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -25,7 +25,6 @@ jobs:
           - ubuntu2404
           - ubuntu2204
           - ubuntu2004
-          - ubuntu1804
           - debian12
           - debian11
         collection_role:
@@ -42,10 +41,6 @@ jobs:
             version: v62
           - container: ubuntu2404
             version: v62
-          - container: ubuntu1804
-            version: v62
-          - container: ubuntu1804
-            version: v64
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -25,7 +25,6 @@ jobs:
           - ubuntu2404
           - ubuntu2204
           - ubuntu2004
-          - ubuntu1804
           - debian12
           - debian11
         collection_role:
@@ -45,10 +44,6 @@ jobs:
         exclude:
           - container: ubuntu2404
             version: v62
-          - container: ubuntu1804
-            version: v62
-          - container: ubuntu1804
-            version: v64
           - container: debian12
             version: v62
     steps:

diff --git a/changelogs/fragments/remove_1804.yml b/changelogs/fragments/remove_1804.yml
@@ -0,0 +1,2 @@
+breaking_changes:
+  - All Roles - Removed support for Ubuntu 18.08 (Bionic)
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:
 | Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |
-| Ubuntu 18.04 bionic |  V  |  V  |  V  |
 | Debian 12 bookworm  |  V  |  V  |  V  |
 | Debian 11 bullseye  |  V  |  V  |  V  |
 

diff --git a/docs/ZABBIX_JAVAGATEWAY_ROLE.md b/docs/ZABBIX_JAVAGATEWAY_ROLE.md
@@ -42,7 +42,6 @@ See the following list of supported Operating systems with the Zabbix releases.
 | Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |
-| Ubuntu 18.04 bionic |  V  |  V  |  V  |
 | Debian 12 bookworm  |  V  |     |  V  |
 | Debian 11 bullseye  |  V  |  V  |  V  |
 

diff --git a/docs/ZABBIX_PROXY_ROLE.md b/docs/ZABBIX_PROXY_ROLE.md
@@ -85,7 +85,6 @@ See the following list of supported Operating systems with the Zabbix releases.
 | Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |
-| Ubuntu 18.04 bionic |  V  |  V  |  V  |
 | Debian 12 bookworm  |  V  |     |  V  |
 | Debian 11 bullseye  |  V  |  V  |  V  |
 

diff --git a/docs/ZABBIX_SERVER_ROLE.md b/docs/ZABBIX_SERVER_ROLE.md
@@ -82,7 +82,6 @@ See the following list of supported Operating systems with the Zabbix releases:
 | Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |
-| Ubuntu 18.04 bionic |     |     |  V  |
 | Debian 12 bookworm  |  V  |     |  V  |
 | Debian 11 bullseye  |  V  |  V  |  V  |
 

diff --git a/docs/ZABBIX_WEB_ROLE.md b/docs/ZABBIX_WEB_ROLE.md
@@ -62,7 +62,6 @@ See the following list of supported Operating Systems with the Zabbix releases.
 | Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |
-| Ubuntu 18.04 bionic |     |     |  V  |
 | Debian 12 bookworm  |  V  |     |  V  |
 | Debian 11 bullseye  |  V  |  V  |  V  |
 

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 ['18', '20'] else 'iproute2' }}"
+          - "{{ 'net-tools' if ansible_distribution_major_version not in ['20'] else 'iproute2' }}"
         state: present
         update_cache: true
       register: zabbix_agent_prepare_packages_install

diff --git a/roles/zabbix_agent/vars/Debian.yml b/roles/zabbix_agent/vars/Debian.yml
@@ -34,10 +34,5 @@ zabbix_valid_agent_versions:
     - 6.2
     - 6.0
 
-  "18":
-    - 6.4
-    - 6.2
-    - 6.0
-
 debian_keyring_path: /etc/apt/keyrings/
 zabbix_gpg_key: "{{ debian_keyring_path }}zabbix-repo.asc"
diff --git a/roles/zabbix_javagateway/vars/Debian.yml b/roles/zabbix_javagateway/vars/Debian.yml
@@ -20,10 +20,6 @@ zabbix_valid_javagateway_versions:
     - 6.4
     - 6.2
     - 6.0
-  "18":
-    - 6.4
-    - 6.2
-    - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/
 zabbix_gpg_key: "{{ debian_keyring_path }}zabbix-repo.asc"
diff --git a/roles/zabbix_proxy/vars/Debian.yml b/roles/zabbix_proxy/vars/Debian.yml
@@ -18,10 +18,6 @@ zabbix_valid_proxy_versions:
     - 6.4
     - 6.2
     - 6.0
-  "18":
-    - 6.4
-    - 6.2
-    - 6.0
 
 _zabbix_proxy_pgsql_dependencies:
   - "{{ zabbix_proxy_install_database_client | ternary('postgresql-client', '') }}"
@@ -45,15 +41,11 @@ _zabbix_proxy_mysql_dependencies:
   "20":
     - default-mysql-client
     - python3-pymysql
-  "18":
-    - default-mysql-client
-    - python3-pymysql
 
 _zabbix_proxy_sqlite3_dependencies:
   - sqlite3
 
 mysql_plugin:
-  "18": mysql_native_password
   "10": mysql_native_password
 
 debian_keyring_path: /etc/apt/keyrings/

diff --git a/roles/zabbix_server/tasks/initialize-mysql.yml b/roles/zabbix_server/tasks/initialize-mysql.yml
@@ -14,17 +14,6 @@
     - database
     - dependencies
 
-# NOTE: Upgrading system-packages with pip is generally a bad idea, but
-# ubuntu-18.04 comes with pymysql==0.8.0, which seems to have a problem with
-# versions 8 and above of mysql.
-- name: Upgrade pymysql
-  when:
-    - ansible_facts['distribution'] == 'Ubuntu'
-    - ansible_facts['distribution_release'] == 'bionic'
-  ansible.builtin.pip:
-    name: "pymysql>=0.10.0,<0.11.0"
-    state: latest
-
 - name: "MySQL Database prep"
   when: zabbix_server_database_creation
   become: "{{ zabbix_server_dbhost_run_install }}"
@@ -79,7 +68,7 @@
         login_host: "{{ zabbix_server_dbhost }}"
         login_port: "{{ zabbix_server_dbport }}"
         login_db: "{{ zabbix_server_dbname }}"
-        query: 'SELECT mandatory FROM dbversion'
+        query: "SELECT mandatory FROM dbversion"
   rescue:
     - name: "MySQL | Get and set schema import overrides"
       delegate_to: "{{ zabbix_server_real_dbhost | default(zabbix_server_dbhost_run_install | ternary(delegated_dbhost, inventory_hostname), true) }}"

diff --git a/roles/zabbix_server/vars/Debian.yml b/roles/zabbix_server/vars/Debian.yml
@@ -26,8 +26,6 @@ zabbix_valid_server_versions:
     - 6.4
     - 6.2
     - 6.0
-  "18":
-    - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/
 zabbix_gpg_key: "{{ debian_keyring_path }}zabbix-repo.asc"

diff --git a/roles/zabbix_web/vars/Debian.yml b/roles/zabbix_web/vars/Debian.yml
@@ -44,8 +44,6 @@ zabbix_valid_web_versions:
     - 6.4
     - 6.2
     - 6.0
-  "18":
-    - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/
 zabbix_gpg_key: "{{ debian_keyring_path }}zabbix-repo.asc"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		breaking_changes:
		- All Roles - Removed support for Ubuntu 18.08 (Bionic)
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,10 +34,5 @@ zabbix_valid_agent_versions: @@
         - 6.2
         - 6.0
-      "18":
-        - 6.4
-        - 6.2
-        - 6.0
     debian_keyring_path: /etc/apt/keyrings/
     zabbix_gpg_key: "{{ debian_keyring_path }}zabbix-repo.asc"