majic-ansible-roles Changeset

Changeset - e6530f711e9c

Parent rev.

Child rev.

[Not reviewed]

0 5 0

Branko Majic (branko) - 5 months ago 2023-12-01 22:27:23
branko@majic.rs

MAR-189: Added support for Debian 11 Bullseye to preseed role.

5 files changed with 51 insertions and 8 deletions:

docs/rolereference.rst

roles/preseed/meta/main.yml

roles/preseed/molecule/default/group_vars/parameters-optional-with-overrides.yml

roles/preseed/molecule/default/molecule.yml

roles/preseed/molecule/default/tests/test_parameters_optional_with_overrides.py

0 comments (0 inline, 0 general)

docs/rolereference.rst

➞

Show inline comments

@@ @@ -131,6 +131,7 @@ Distribution compatibility @@
 Role is compatible with the following distributions:
 - Debian 10 (Buster)
 - Debian 11 (Bullseye)
 Examples

roles/preseed/meta/main.yml

➞

Show inline comments

@@ @@ -9,3 +9,4 @@ galaxy_info: @@
     - name: Debian
       versions:
         - 10
         - 11

roles/preseed/molecule/default/group_vars/parameters-optional-with-overrides.yml

➞

Show inline comments

@@ @@ -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

roles/preseed/molecule/default/molecule.yml

➞

Show inline comments

@@ @@ -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:

roles/preseed/molecule/default/tests/test_parameters_optional_with_overrides.py

➞

Show inline comments

 @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))
 @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))

0 comments (0 inline, 0 general)