From 5640e493e6434745680803dc796b3925c26827f7 Mon Sep 17 00:00:00 2001 From: Fergal Mc Carthy Date: Tue, 6 Aug 2024 10:15:14 -0400 Subject: [PATCH] Switch to SLES 15 SP3 as default target and image build base --- doc/adoc/user_guide.adoc | 8 ++++---- image/pubcloud/sle15/config.kiwi | 18 ++++++++++++++++++ test/data/custom-migration-config.yml | 2 +- test/unit/defaults_test.py | 14 +++++++------- test/unit/migration_config_test.py | 22 +++++++++++----------- 5 files changed, 41 insertions(+), 23 deletions(-) diff --git a/doc/adoc/user_guide.adoc b/doc/adoc/user_guide.adoc index e50a940f..8d4df28c 100644 --- a/doc/adoc/user_guide.adoc +++ b/doc/adoc/user_guide.adoc @@ -100,7 +100,7 @@ data or processes. For example, DMS will function if /home is its own partition, but not if /var is on a separate partition from root. SLES Version Support:: -Upgrade is supported from SLES12 SP4 or SLES12 SP5 to SLES 15 SP1. It is +Upgrade is supported from SLES12 SP4 or SLES12 SP5 to SLES 15 SP3. It is possible to configure other versions of SLES as the migration target, but doing so is not a tested or supported use case. @@ -370,8 +370,8 @@ the commands from the Installation Section of this document. * Upgrade is only possible for systems that use unencrypted root file systems, at the OS level. Encrypting the root device using a cloud framework encryption mechanism happens at a different level. -* Upgrade has been tested for SLES 12 SP4 to SLES 15 SP1 -* Upgrade has been tested for SLES 12 SP5 to SLES 15 SP1 +* Upgrade has been tested for SLES 12 SP4 to SLES 15 SP3 +* Upgrade has been tested for SLES 12 SP5 to SLES 15 SP3 * The system is primarily intended for Public Cloud instance upgrade use. The system also works for simple setups in a data center setting on physical installations. However, for any more complex configurations the off line @@ -397,5 +397,5 @@ the commands from the Installation Section of this document. * The only supported migration path in the Public Cloud is from the final 2 service packs of a distribution to the first service pack of the next distribution. For example from SLES 12 SP4 or SLES 12 SP5 to - SLES 15 SP1. The packages delivered by SUSE in the Public Cloud Module + SLES 15 SP3. The packages delivered by SUSE in the Public Cloud Module implement this behavior by default. diff --git a/image/pubcloud/sle15/config.kiwi b/image/pubcloud/sle15/config.kiwi index 652c4b06..dd92cb53 100644 --- a/image/pubcloud/sle15/config.kiwi +++ b/image/pubcloud/sle15/config.kiwi @@ -23,6 +23,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/test/data/custom-migration-config.yml b/test/data/custom-migration-config.yml index 5b5d8eb9..05442c5f 100644 --- a/test/data/custom-migration-config.yml +++ b/test/data/custom-migration-config.yml @@ -1,2 +1,2 @@ debug: true -migration_product: 'SLES/15.1/x86_64' +migration_product: 'SLES/15.3/x86_64' diff --git a/test/unit/defaults_test.py b/test/unit/defaults_test.py index 8c500e19..53d7ea2c 100644 --- a/test/unit/defaults_test.py +++ b/test/unit/defaults_test.py @@ -23,19 +23,19 @@ def test_get_os_release(self): ] ) os_release_result = os_release_tuple( - name='SLES', version='15-SP1', version_id='15.1', - pretty_name='SUSE Linux Enterprise Server 15 SP1', + name='SLES', version='15-SP3', version_id='15.3', + pretty_name='SUSE Linux Enterprise Server 15 SP3', id='sles', id_like='suse', ansi_color='0;32', - cpe_name='cpe:/o:suse:sles:15:sp1' + cpe_name='cpe:/o:suse:sles:15:sp3' ) os_release_content = ('NAME="SLES"\n' - 'VERSION="15-SP1"\n' - 'VERSION_ID="15.1"\n' - 'PRETTY_NAME="SUSE Linux Enterprise Server 15 SP1"\n' + 'VERSION="15-SP3"\n' + 'VERSION_ID="15.3"\n' + 'PRETTY_NAME="SUSE Linux Enterprise Server 15 SP3"\n' 'ID="sles"\n' 'ID_LIKE="suse"\n' 'ANSI_COLOR="0;32"\n' - 'CPE_NAME="cpe:/o:suse:sles:15:sp1"') + 'CPE_NAME="cpe:/o:suse:sles:15:sp3"') with patch('builtins.open', create=True) as mock_open: mock_open_os_release = MagicMock(spec=io.IOBase) diff --git a/test/unit/migration_config_test.py b/test/unit/migration_config_test.py index f4dd3b5c..81625994 100644 --- a/test/unit/migration_config_test.py +++ b/test/unit/migration_config_test.py @@ -39,14 +39,14 @@ def test_get_migration_product_auto_detected( ] ) os_release_result = os_release_tuple( - name='SLES', version='15-SP1', version_id='15.1', - pretty_name='SUSE Linux Enterprise Server 15 SP1', + name='SLES', version='15-SP3', version_id='15.3', + pretty_name='SUSE Linux Enterprise Server 15 SP3', id='sles', id_like='suse', ansi_color='0;32', - cpe_name='cpe:/o:suse:sles:15:sp1' + cpe_name='cpe:/o:suse:sles:15:sp3' ) mock_get_system_root_path.return_value = '../data' mock_get_os_release.return_value = os_release_result - assert self.config.get_migration_product() == 'SLES/15.1/x86_64' + assert self.config.get_migration_product() == 'SLES/15.3/x86_64' @patch.object(Defaults, 'get_os_release') @patch.object(SUSEBaseProduct, 'get_tag') @@ -62,10 +62,10 @@ def test_get_migration_product_targets( ] ) os_release_result = os_release_tuple( - name='SLES', version='15-SP1', version_id='15.1', - pretty_name='SUSE Linux Enterprise Server 15 SP1', + name='SLES', version='15-SP3', version_id='15.3', + pretty_name='SUSE Linux Enterprise Server 15 SP3', id='sles', id_like='suse', ansi_color='0;32', - cpe_name='cpe:/o:suse:sles:15:sp1' + cpe_name='cpe:/o:suse:sles:15:sp3' ) mock_get_system_root_path.return_value = '../data' mock_get_os_release.return_value = os_release_result @@ -91,16 +91,16 @@ def test_update_migration_config_file_no_autodetect( ] ) os_release_result = os_release_tuple( - name='SLES', version='15-SP1', version_id='15.1', - pretty_name='SUSE Linux Enterprise Server 15 SP1', + name='SLES', version='15-SP3', version_id='15.3', + pretty_name='SUSE Linux Enterprise Server 15 SP3', id='sles', id_like='suse', ansi_color='0;32', - cpe_name='cpe:/o:suse:sles:15:sp1' + cpe_name='cpe:/o:suse:sles:15:sp3' ) mock_get_os_release.return_value = os_release_result mock_get_system_root_path.return_value = '../data' mock_get_product_name.return_value = None self.config.update_migration_config_file() - assert self.config.get_migration_product() == 'SLES/15.1/x86_64' + assert self.config.get_migration_product() == 'SLES/15.3/x86_64' assert self.config.is_debug_requested() is True def test_is_zypper_migration_plugin_requested(self):