From e6530f711e9c7b5a22a71a875c456b9e7f3d1155 2023-12-01 22:27:23
From: Branko Majic <branko@majic.rs>
Date: 2023-12-01 22:27:23
Subject: [PATCH] MAR-189: Added support for Debian 11 Bullseye to preseed role.

---

diff --git a/docs/rolereference.rst b/docs/rolereference.rst
index d093fcb533a0e4e45906ad607033d9435cbbeece..dd1ad3d677c17e96ec811a6af5ffa1e2dcc8ddf8 100644
--- a/docs/rolereference.rst
+++ b/docs/rolereference.rst
@@ -131,6 +131,7 @@ Distribution compatibility
 Role is compatible with the following distributions:
 
 - Debian 10 (Buster)
+- Debian 11 (Bullseye)
 
 
 Examples
diff --git a/roles/preseed/meta/main.yml b/roles/preseed/meta/main.yml
index d8a3ce6dc0a2c3161a24ec63a91e9c8297666420..d12df402432f3c79746102dc070fa2d7343c8f55 100644
--- a/roles/preseed/meta/main.yml
+++ b/roles/preseed/meta/main.yml
@@ -9,3 +9,4 @@ galaxy_info:
     - name: Debian
       versions:
         - 10
+        - 11
diff --git a/roles/preseed/molecule/default/group_vars/parameters-optional-with-overrides.yml b/roles/preseed/molecule/default/group_vars/parameters-optional-with-overrides.yml
index ad321e952b60f332adb015213fa57e80fb6a13c4..8a2c886247aa500c97b94fcf0f8d93d7eb0b1a27 100644
--- a/roles/preseed/molecule/default/group_vars/parameters-optional-with-overrides.yml
+++ b/roles/preseed/molecule/default/group_vars/parameters-optional-with-overrides.yml
@@ -3,7 +3,25 @@
 ansible_key: MY_ANSIBLE_KEY
 preseed_directory: "/tmp/preseed_files/"
 preseed_server_overrides:
-  parameters-optional-with-overrides-buster64:
+  parameters-optional-with-overrides-buster:
+    country: RS
+    dns: 1.1.1.1
+    domain: example.com
+    gateway: 2.2.2.2
+    hostname: testing
+    ip: 3.3.3.3
+    keymap: sv
+    language: sr
+    locale: en_UK.UTF-8
+    mirror_directory: /
+    mirror_hostname: ftp.de.debian.org
+    mirror_proxy: http://proxy.local
+    netmask: 255.255.0.0
+    network_auto: false
+    network_interface: eth1
+    root_password: myrootpassword
+    timezone: Europe/Belgrade
+  parameters-optional-with-overrides-bullseye:
     country: RS
     dns: 1.1.1.1
     domain: example.com
diff --git a/roles/preseed/molecule/default/molecule.yml b/roles/preseed/molecule/default/molecule.yml
index 5c250abffe6f3b3e7fefdd47ba6cee3cde440e7d..a62021008983b8eb69cbdd5140148a8efe99985b 100644
--- a/roles/preseed/molecule/default/molecule.yml
+++ b/roles/preseed/molecule/default/molecule.yml
@@ -14,27 +14,48 @@ lint:
 
 platforms:
 
-  - name: parameters-mandatory-buster64
+  - name: parameters-mandatory-buster
     groups:
       - parameters-mandatory
     box: debian/contrib-buster64
     memory: 256
     cpus: 1
 
-  - name: parameters-optional-buster64
+  - name: parameters-optional-buster
     groups:
       - parameters-optional
     box: debian/contrib-buster64
     memory: 256
     cpus: 1
 
-  - name: parameters-optional-with-overrides-buster64
+  - name: parameters-optional-with-overrides-buster
     groups:
       - parameters-optional-with-overrides
     box: debian/contrib-buster64
     memory: 256
     cpus: 1
 
+  - name: parameters-mandatory-bullseye
+    groups:
+      - parameters-mandatory
+    box: debian/bullseye64
+    memory: 256
+    cpus: 1
+
+  - name: parameters-optional-bullseye
+    groups:
+      - parameters-optional
+    box: debian/bullseye64
+    memory: 256
+    cpus: 1
+
+  - name: parameters-optional-with-overrides-bullseye
+    groups:
+      - parameters-optional-with-overrides
+    box: debian/bullseye64
+    memory: 256
+    cpus: 1
+
 provisioner:
   name: ansible
   config_options:
diff --git a/roles/preseed/molecule/default/tests/test_parameters_optional_with_overrides.py b/roles/preseed/molecule/default/tests/test_parameters_optional_with_overrides.py
index b8392391f0df3eda2ff41bb4e334926ba2a53dae..2a8c88677c5b63220be02b0cdfc8ad18ac464525 100644
--- a/roles/preseed/molecule/default/tests/test_parameters_optional_with_overrides.py
+++ b/roles/preseed/molecule/default/tests/test_parameters_optional_with_overrides.py
@@ -10,14 +10,15 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 
 
 @pytest.mark.parametrize("distribution_release", [
-    "buster"
+    "buster",
+    "bullseye"
 ])
 def test_preseed_configuration_file_content_host_without_overrides(host, distribution_release):
     """
     Tests content of generated preseed configuration file.
     """
 
-    hostname = 'parameters-mandatory-%s64' % distribution_release
+    hostname = 'parameters-mandatory-%s' % distribution_release
 
     with host.sudo():
         preseed_file = host.file(os.path.join("/tmp/preseed_files", "%s.cfg" % hostname))
@@ -45,14 +46,15 @@ d-i netcfg/get_domain string ignored-value""" in preseed_file_content
 
 
 @pytest.mark.parametrize("distribution_release", [
-    "buster"
+    "buster",
+    "bullseye"
 ])
 def test_preseed_configuration_file_content_host_with_overrides(host, distribution_release):
     """
     Tests content of generated preseed configuration file.
     """
 
-    hostname = 'parameters-optional-with-overrides-%s64' % distribution_release
+    hostname = 'parameters-optional-with-overrides-%s' % distribution_release
 
     with host.sudo():
         preseed_file = host.file(os.path.join("/tmp/preseed_files", "%s.cfg" % hostname))