Rebase on upstream most recent version 0.23.0-1 (dcf53c28ea9c3fdd03277abcdeb1d124660f7f8e)

.packit.yaml

@@ -168,6 +168,7 @@ jobs:
   env:
     SOURCE_RELEASE: "8.10"
     TARGET_RELEASE: "9.4"
+    LEAPP_TARGET_PRODUCT_CHANNEL: "EUS"
 
 # On-demand minimal beaker tests
 - &beaker-minimal-810to94
@@ -194,6 +195,7 @@ jobs:
   env:
     SOURCE_RELEASE: "8.10"
     TARGET_RELEASE: "9.4"
+    LEAPP_TARGET_PRODUCT_CHANNEL: "EUS"
 
 # On-demand kernel-rt tests
 - &kernel-rt-810to94
@@ -220,6 +222,7 @@ jobs:
   env:
     SOURCE_RELEASE: "8.10"
     TARGET_RELEASE: "9.4"
+    LEAPP_TARGET_PRODUCT_CHANNEL: "EUS"
 
 # Tests: 8.10 -> 9.6
 - &sanity-810to96
@@ -295,6 +298,80 @@ jobs:
     SOURCE_RELEASE: "8.10"
     TARGET_RELEASE: "9.6"
 
+# Tests: 8.10 -> 9.7
+- &sanity-810to97
+  <<: *sanity-abstract-8to9
+  trigger: pull_request
+  identifier: sanity-8.10to9.7
+  tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:8to9 & tag:tier0 & enabled:true'
+    environments:
+      - tmt:
+          context:
+            distro: "rhel-8.10"
+            distro_target: "rhel-9.7"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+  env:
+    SOURCE_RELEASE: "8.10"
+    TARGET_RELEASE: "9.7"
+
+# On-demand minimal beaker tests
+- &beaker-minimal-810to97
+  <<: *beaker-minimal-8to9-abstract-ondemand
+  trigger: pull_request
+  labels:
+    - beaker-minimal
+    - beaker-minimal-8.10to9.7
+    - 8.10to9.7
+  identifier: sanity-8.10to9.7-beaker-minimal-ondemand
+  tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:8to9 & tag:partitioning & enabled:true'
+    environments:
+      - tmt:
+          context:
+            distro: "rhel-8.10"
+            distro_target: "rhel-9.7"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+  env:
+    SOURCE_RELEASE: "8.10"
+    TARGET_RELEASE: "9.7"
+
+# On-demand kernel-rt tests
+- &kernel-rt-810to97
+  <<: *kernel-rt-abstract-8to9-ondemand
+  trigger: pull_request
+  labels:
+    - kernel-rt
+    - kernel-rt-8.10to9.7
+    - 8.10to9.7
+  identifier: sanity-8.10to9.7-kernel-rt-ondemand
+  tf_extra_params:
+    test:
+      tmt:
+         plan_filter: 'tag:8to9 & tag:kernel-rt & enabled:true'
+    environments:
+      - tmt:
+          context:
+            distro: "rhel-8.10"
+            distro_target: "rhel-9.7"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+  env:
+    SOURCE_RELEASE: "8.10"
+    TARGET_RELEASE: "9.7"
+
 # ###################################################################### #
 # ############################## 9 TO 10 ################################ #
 # ###################################################################### #
@@ -351,6 +428,9 @@ jobs:
   <<: *sanity-abstract-9to10
   trigger: pull_request
   identifier: sanity-9.6to10.0
+  targets:
+    epel-9-x86_64:
+      distros: [RHEL-9.6.0-Nightly]
   tf_extra_params:
     test:
       tmt:
@@ -377,6 +457,9 @@ jobs:
     - beaker-minimal-9.6to10.0
     - 9.6to10.0
   identifier: sanity-9.6to10.0-beaker-minimal-ondemand
+  targets:
+    epel-9-x86_64:
+      distros: [RHEL-9.6-Nightly]
   tf_extra_params:
     test:
       tmt:
@@ -419,3 +502,86 @@ jobs:
   env:
     SOURCE_RELEASE: "9.6"
     TARGET_RELEASE: "10.0"
+
+# Tests: 9.7 -> 10.1
+- &sanity-97to101
+  <<: *sanity-abstract-9to10
+  trigger: pull_request
+  identifier: sanity-9.7to10.1
+  targets:
+    epel-9-x86_64:
+      distros: [RHEL-9.7.0-Nightly]
+  tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:9to10 & tag:tier0 & enabled:true'
+    environments:
+      - tmt:
+          context:
+            distro: "rhel-9.7"
+            distro_target: "rhel-10.1"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+  env:
+    SOURCE_RELEASE: "9.7"
+    TARGET_RELEASE: "10.1"
+
+# On-demand minimal beaker tests
+- &beaker-minimal-97to101
+  <<: *beaker-minimal-9to10-abstract-ondemand
+  trigger: pull_request
+  labels:
+    - beaker-minimal
+    - beaker-minimal-9.7to10.1
+    - 9.7to10.1
+  identifier: sanity-9.7to10.1-beaker-minimal-ondemand
+  targets:
+    epel-9-x86_64:
+      distros: [RHEL-9.7-Nightly]
+  tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:8to9 & tag:partitioning & enabled:true'
+    environments:
+      - tmt:
+          context:
+            distro: "rhel-9.7"
+            distro_target: "rhel-10.1"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+  env:
+    SOURCE_RELEASE: "9.7"
+    TARGET_RELEASE: "10.1"
+
+# On-demand kernel-rt tests
+- &kernel-rt-97to101
+  <<: *kernel-rt-abstract-9to10-ondemand
+  trigger: pull_request
+  labels:
+    - kernel-rt
+    - kernel-rt-9.7to10.1
+    - 9.7to10.1
+  identifier: sanity-9.7to10.1-kernel-rt-ondemand
+  targets:
+    epel-9-x86_64:
+      distros: [RHEL-9.7-Nightly]
+  tf_extra_params:
+    test:
+      tmt:
+         plan_filter: 'tag:8to9 & tag:kernel-rt & enabled:true'
+    environments:
+      - tmt:
+          context:
+            distro: "rhel-9.7"
+            distro_target: "rhel-10.1"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+  env:
+    SOURCE_RELEASE: "9.7"
+    TARGET_RELEASE: "10.1"

Makefile

@@ -496,6 +496,7 @@ fast_lint:
 	@. $(VENVNAME)/bin/activate; \
 	FILES_TO_LINT="$$(git diff --name-only $(MASTER_BRANCH) --diff-filter AMR | grep '\.py$$')"; \
 	if [[ -n "$$FILES_TO_LINT" ]]; then \
+		isort -c --diff $$FILES_TO_LINT && \
 		pylint -j 0 $$FILES_TO_LINT $(PYLINT_ARGS) && \
 		flake8 $$FILES_TO_LINT $(FLAKE8_ARGS); \
 		LINT_EXIT_CODE="$$?"; \

commands/command_utils.py

@@ -36,11 +36,13 @@ class _VersionKind(str, Enum):
 class DistroIDs(str, Enum):
     RHEL = 'rhel'
     CENTOS = 'centos'
+    ALMALINUX = 'almalinux'
 
 
 _DISTRO_VERSION_FORMATS = {
     DistroIDs.RHEL: VersionFormats.MAJOR_MINOR,
     DistroIDs.CENTOS: VersionFormats.MAJOR_ONLY,
+    DistroIDs.ALMALINUX: VersionFormats.MAJOR_MINOR,
 }
 """
 Maps distro ID to the expected OS version format.
@@ -134,6 +136,16 @@ def get_os_release_version_id(filepath):
     return _retrieve_os_release_contents(_os_release_path=filepath).get('VERSION_ID', '')
 
 
+def get_distro_id():
+    """
+    Retrieve the OS release ID from /etc/os-release.
+
+    :return: The OS release ID from /etc/os-release
+    :rtype: str
+    """
+    return _retrieve_os_release_contents('/etc/os-release').get('ID', '')
+
+
 def get_upgrade_paths_config():
     # NOTE(ivasilev) Importing here not to have circular dependencies
     from leapp.cli.commands.upgrade import util  # noqa: C415; pylint: disable=import-outside-toplevel
@@ -203,8 +215,7 @@ def get_target_release(args):
 
     target_ver = env_version_override or args.target
     if target_ver:
-        os_release_contents = _retrieve_os_release_contents()
-        distro_id = os_release_contents.get('ID', '')
+        distro_id = get_distro_id()
         expected_version_format = _DISTRO_VERSION_FORMATS.get(distro_id, VersionFormats.MAJOR_MINOR).value
         assert_version_format(target_ver, expected_version_format, _VersionKind.TARGET)
         return (target_ver, flavor)

commands/preupgrade/__init__.py

@@ -20,8 +20,12 @@
              choices=list(util.EXPERIMENTAL_FEATURES), default=[])
 @command_opt('debug', is_flag=True, help='Enable debug mode', inherit=False)
 @command_opt('verbose', is_flag=True, help='Enable verbose logging', inherit=False)
-@command_opt('no-rhsm', is_flag=True, help='Use only custom repositories and skip actions'
-                                           ' with Red Hat Subscription Manager')
+@command_opt(
+    'no-rhsm',
+    is_flag=True,
+    help='Use only custom repositories and skip actions with Red Hat Subscription Manager.'
+         ' This only has effect on Red Hat Enterprise Linux systems.'
+)
 @command_opt('no-insights-register', is_flag=True, help='Do not register into Red Hat Insights')
 @command_opt('no-rhsm-facts', is_flag=True, help='Do not store migration information using Red Hat '
                                                  'Subscription Manager. Automatically implied by --no-rhsm.')

commands/upgrade/__init__.py

@@ -26,8 +26,12 @@
              choices=list(util.EXPERIMENTAL_FEATURES), default=[])
 @command_opt('debug', is_flag=True, help='Enable debug mode', inherit=False)
 @command_opt('verbose', is_flag=True, help='Enable verbose logging', inherit=False)
-@command_opt('no-rhsm', is_flag=True, help='Use only custom repositories and skip actions'
-                                           ' with Red Hat Subscription Manager')
+@command_opt(
+    'no-rhsm',
+    is_flag=True,
+    help='Use only custom repositories and skip actions with Red Hat Subscription Manager.'
+         ' This only has effect on Red Hat Enterprise Linux systems.'
+)
 @command_opt('no-insights-register', is_flag=True, help='Do not register into Red Hat Insights')
 @command_opt('no-rhsm-facts', is_flag=True, help='Do not store migration information using Red Hat '
                                                  'Subscription Manager. Automatically implied by --no-rhsm.')

commands/upgrade/util.py

@@ -222,7 +222,8 @@ def prepare_configuration(args):
         os.environ['LEAPP_EXPERIMENTAL'] = '1'
 
     os.environ['LEAPP_UNSUPPORTED'] = '0' if os.getenv('LEAPP_UNSUPPORTED', '0') == '0' else '1'
-    if args.no_rhsm:
+    # force no rhsm on non-rhel systems, regardless of whether the binary is there
+    if args.no_rhsm or command_utils.get_distro_id() != 'rhel':
         os.environ['LEAPP_NO_RHSM'] = '1'
     elif not os.path.exists('/usr/sbin/subscription-manager'):
         os.environ['LEAPP_NO_RHSM'] = '1'

docs/source/conf.py

@@ -11,7 +11,7 @@
 project = 'leapp-repository'
 copyright = '2025, Leapp team'
 author = 'Leapp team'
-release = '0.22.0'
+release = '0.23.0'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

docs/source/libraries-and-api/deprecations-list.md

@@ -1,7 +1,7 @@
 # Deprecated functionality
 Deprecated functionality is listed under the first version that the functionality
-is deprecated in. Note that functionality may be deprecated in later versions
-but are not listed again.
+is deprecated in. Note that functionality may be removed in later versions
+but will not be listed again.
 The dates in brackets correspond to the end of the deprecation protection period,
 after which the related functionality can be removed at any time.
 
@@ -14,10 +14,15 @@ Only the versions in which a deprecation has been made are listed.
 
 ## Next release <span style="font-size:0.5em; font-weight:normal">(till TODO date)</span>
 
+- Note: nothing new deprecated yet
+
+## v0.23.0 <span style="font-size:0.5em; font-weight:normal">(till March 2026)</span>
+
 - Shared libraries
   - **`leapp.libraries.common.config.version.SUPPORTED_VERSIONS`** - The `SUPPORTED_VERSIONS` dict has been deprecated as it is problematic with the new design. Use `leapp.libraries.common.config.version.is_supported_version()` or `IPUConfig.supported_upgrade_paths` instead.
   - **`leapp.libraries.common.config.version.is_rhel_alt()`** - The function can return only `False` nowadays as RHEL-ALT 7 is EOL for years and future version of leapp-repository will not support RHEL 7 anymore.
-
+- Models
+  - **`InstalledUnsignedRPM`** - Replaced by the distribution agnostic `ThirdPartyRPM`.
 
 ## v0.20.0 <span style="font-size:0.5em; font-weight:normal">(till September 2024)</span>
 - Models

etc/fapolicyd/rules.d/31-leapp-repository.rules

@@ -0,0 +1,2 @@
+allow perm=any all : dir=/var/lib/leapp/
+

etc/leapp/files/device_driver_deprecation_data.json

@@ -2726,7 +2726,7 @@
       ],
       "deprecation_announced": "",
       "device_id": "0x9005:0x0200:0x9005:0x0200",
-      "device_name": "",
+      "device_name": "Adaptec: AAC-RAID: Themisto Jupiter Platform",
       "device_type": "pci",
       "driver_name": "aacraid",
       "maintained_in_rhel": [
@@ -2824,6 +2824,19 @@
         7
       ]
     },
+    {
+      "available_in_rhel": [
+        7
+      ],
+      "deprecation_announced": "",
+      "device_id": "0x9005:0x0285:0x1028:0x0291",
+      "device_name": "Adaptec: AAC-RAID: CERC SATA RAID 2 PCI SATA 6ch (DellCorsair)",
+      "device_type": "pci",
+      "driver_name": "aacraid",
+      "maintained_in_rhel": [
+        7
+      ]
+    },
     {
       "available_in_rhel": [
         7
@@ -3363,7 +3376,7 @@
       ],
       "deprecation_announced": "",
       "device_id": "0x9005:0x0287:0x9005:0x0800",
-      "device_name": "",
+      "device_name": "Adaptec: AAC-RAID: Themisto Jupiter Platform",
       "device_type": "pci",
       "driver_name": "aacraid",
       "maintained_in_rhel": [
@@ -3376,7 +3389,7 @@
       ],
       "deprecation_announced": "",
       "device_id": "0x9005:0x0288",
-      "device_name": "",
+      "device_name": "Adaptec: AAC-RAID: NEMER/ARK Catch All",
       "device_type": "pci",
       "driver_name": "aacraid",
       "maintained_in_rhel": [