From 5dd2fe95221c2e971dfd4bd6122ce863059a163d 2020-05-06 12:45:31 From: Branko Majic Date: 2020-05-06 12:45:31 Subject: [PATCH] MAR-152: Drop support for Debian 8 Jessie from the preseed role. --- 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 c550937c238174908292ab978b11e059eb89fa9e..48cec1171ee5cc068e95a7c7b62337c868cf69bc 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,7 @@ preseed_directory: /tmp/custom_preseed_files_location ansible_key: CUSTOMKEY preseed_server_overrides: - parameters-optional-with-overrides-jessie64: + parameters-optional-with-overrides-stretch64: 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 d6921d41014e5c33be2d083d1731b0db7c5c2617..ce6d6d3815d03f700dc4eb404c3ea479fa320266 100644 --- a/roles/preseed/molecule/default/molecule.yml +++ b/roles/preseed/molecule/default/molecule.yml @@ -14,27 +14,6 @@ lint: platforms: - - name: parameters-mandatory-jessie64 - groups: - - parameters-mandatory - box: debian/contrib-jessie64 - memory: 256 - cpus: 1 - - - name: parameters-optional-jessie64 - groups: - - parameters-optional - box: debian/contrib-jessie64 - memory: 256 - cpus: 1 - - - name: parameters-optional-with-overrides-jessie64 - groups: - - parameters-optional-with-overrides - box: debian/contrib-jessie64 - memory: 256 - cpus: 1 - - name: parameters-mandatory-stretch64 groups: - parameters-mandatory 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 0fd5b0fd04f96d843f98edbbbd994dff5d7219bb..c8ceb22951ac474063ee726892c395c883b2ccdf 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 @@ -28,7 +28,7 @@ def test_preseed_configuration_file_content_host_without_overrides(host): Tests content of generated preseed configuration file. """ - hostname = 'parameters-mandatory-jessie64' + hostname = 'parameters-mandatory-stretch64' with host.sudo(): preseed_file = host.file(os.path.join(PRESEED_DIRECTORY, "%s.cfg" % hostname)) @@ -60,7 +60,7 @@ def test_preseed_configuration_file_content_host_with_overrides(host): Tests content of generated preseed configuration file. """ - hostname = 'parameters-optional-with-overrides-jessie64' + hostname = 'parameters-optional-with-overrides-stretch64' with host.sudo(): preseed_file = host.file(os.path.join(PRESEED_DIRECTORY, "%s.cfg" % hostname))