From 257af1cc70e98ae83c2321f977974f66c4946541 2024-08-30 14:14:10
From: Branko Majic <branko@majic.rs>
Date: 2024-08-30 14:14:10
Subject: [PATCH] MAR-239: Dropped support for Debian 11 Bullseye from the database_server role.

---

diff --git a/roles/database_server/molecule/default/molecule.yml b/roles/database_server/molecule/default/molecule.yml
index 50217ebb3c3e09d28768ddbc571dff625c92b86d..8feedeed241432df6603d45889bbc363141ee209 100644
--- a/roles/database_server/molecule/default/molecule.yml
+++ b/roles/database_server/molecule/default/molecule.yml
@@ -14,15 +14,6 @@ lint:
 
 platforms:
 
-  - name: parameters-mandatory-bullseye
-    groups:
-      - parameters-mandatory
-    box: debian/bullseye64
-    memory: 512
-    cpus: 1
-    provider_raw_config_args:
-      - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
-
   - name: parameters-mandatory-bookworm
     groups:
       - parameters-mandatory
diff --git a/roles/database_server/molecule/default/tests/test_default.py b/roles/database_server/molecule/default/tests/test_default.py
index 8d56e2f6f25a3af5e87ca7043a53cf7cfb889d00..812ba85b1edfc07eca16d89dd9534d9088d0403c 100644
--- a/roles/database_server/molecule/default/tests/test_default.py
+++ b/roles/database_server/molecule/default/tests/test_default.py
@@ -47,12 +47,7 @@ def test_utf8_configuration(host):
     Tests if UTF-8 configuration has been applied correctly to server.
     """
 
-    expected_character_set_and_collation = {
-        "bullseye": "utf8\nutf8_general_ci\n",
-        "bookworm": "utf8mb3\nutf8mb3_general_ci\n",
-    }
-
-    distribution_release = host.ansible("setup")["ansible_facts"]["ansible_distribution_release"]
+    expected_character_set_and_collation = "utf8mb3\nutf8mb3_general_ci\n"
 
     with host.sudo():
         assert host.run("mysql -uroot -BNe 'drop database if exists test'").rc == 0
@@ -61,14 +56,14 @@ def test_utf8_configuration(host):
         check_server = host.run("mysql -uroot test -BNe 'select @@character_set_server; select @@collation_server'")
 
         assert check_server.rc == 0
-        assert check_server.stdout == expected_character_set_and_collation[distribution_release]
+        assert check_server.stdout == expected_character_set_and_collation
 
         check_database = host.run("mysql -uroot test -BNe 'select @@character_set_database; select @@collation_database'")
 
         assert check_database.rc == 0
-        assert check_database.stdout == expected_character_set_and_collation[distribution_release]
+        assert check_database.stdout == expected_character_set_and_collation
 
         check_database = host.run("mysql -uroot -BNe 'select @@character_set_connection; select @@collation_connection'")
 
         assert check_database.rc == 0
-        assert check_database.stdout == expected_character_set_and_collation[distribution_release]
+        assert check_database.stdout == expected_character_set_and_collation
diff --git a/roles/database_server/templates/utf8.cnf.j2 b/roles/database_server/templates/utf8.cnf.j2
index ac1e31328b732d6da707878d595c0f56c6b5d684..96885e42e053d81a2fca197017d59207cfd16191 100644
--- a/roles/database_server/templates/utf8.cnf.j2
+++ b/roles/database_server/templates/utf8.cnf.j2
@@ -1,13 +1,3 @@
-{% if ansible_distribution_release == 'bullseye' %}
-[client]
-default-character-set = utf8
-
-[mysqld]
-character-set-server  = utf8
-collation-server      = utf8_general_ci
-character_set_server  = utf8
-collation_server      = utf8_general_ci
-{% else %}
 [client]
 default-character-set = utf8mb3
 
@@ -16,4 +6,3 @@ character-set-server  = utf8mb3
 collation-server      = utf8mb3_general_ci
 character_set_server  = utf8mb3
 collation_server      = utf8mb3_general_ci
-{% endif %}