b4aed63dad
- Enable new upgrade path RHEL 8.10 -> 9.5 - Minor updates in reports - Add information about leapp invocation to leapp.db - Resolves: RHEL-27847
57 lines
2.1 KiB
Diff
57 lines
2.1 KiB
Diff
From c68bc5ef0f277a5878802566dc5517a1f98feac6 Mon Sep 17 00:00:00 2001
|
|
From: Evgeni Golov <evgeni@golov.de>
|
|
Date: Thu, 16 May 2024 11:08:47 +0200
|
|
Subject: [PATCH 41/49] properly indent the list of supported OSes
|
|
|
|
before:
|
|
```
|
|
Risk Factor: high (inhibitor)
|
|
Title: The installed OS version is not supported for the in-place upgrade to the target RHEL version
|
|
Summary: The supported OS releases for the upgrade process:
|
|
RHEL 8.8
|
|
RHEL 8.10
|
|
RHEL-SAPHANA 8.8
|
|
RHEL-SAPHANA 8.10
|
|
```
|
|
|
|
after:
|
|
```
|
|
Risk Factor: high (inhibitor)
|
|
Title: The installed OS version is not supported for the in-place upgrade to the target RHEL version
|
|
Summary: The supported OS releases for the upgrade process:
|
|
- RHEL 8.8
|
|
- RHEL 8.10
|
|
- RHEL-SAPHANA 8.8
|
|
- RHEL-SAPHANA 8.10
|
|
```
|
|
---
|
|
.../common/actors/checkosrelease/libraries/checkosrelease.py | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/repos/system_upgrade/common/actors/checkosrelease/libraries/checkosrelease.py b/repos/system_upgrade/common/actors/checkosrelease/libraries/checkosrelease.py
|
|
index e57ba1a7..bbc6b5ae 100644
|
|
--- a/repos/system_upgrade/common/actors/checkosrelease/libraries/checkosrelease.py
|
|
+++ b/repos/system_upgrade/common/actors/checkosrelease/libraries/checkosrelease.py
|
|
@@ -4,6 +4,7 @@ from leapp import reporting
|
|
from leapp.libraries.common.config import version
|
|
|
|
COMMON_REPORT_TAGS = [reporting.Groups.SANITY]
|
|
+FMT_LIST_SEPARATOR = '\n - '
|
|
|
|
related = [reporting.RelatedResource('file', '/etc/os-release')]
|
|
|
|
@@ -34,8 +35,8 @@ def check_os_version():
|
|
'The installed OS version is not supported for the in-place upgrade to the target RHEL version'
|
|
),
|
|
reporting.Summary(
|
|
- 'The supported OS releases for the upgrade process:\n'
|
|
- ' {}'.format('\n'.join(supported_releases))
|
|
+ 'The supported OS releases for the upgrade process:'
|
|
+ '{}{}'.format(FMT_LIST_SEPARATOR, FMT_LIST_SEPARATOR.join(supported_releases))
|
|
),
|
|
reporting.Severity(reporting.Severity.HIGH),
|
|
reporting.Groups(COMMON_REPORT_TAGS),
|
|
--
|
|
2.44.0
|
|
|