Merge remote-tracking branch 'upstream/SLE-15-SP6' into SLE-15-SP6

package/autoyast2.changes

@@ -3,7 +3,13 @@ Thu Feb 15 10:19:32 UTC 2024 - Michal Filka <mfilka@suse.com>
 
 - jsc#PED-6407
   - enabled lvm_vg_reuse to be used in general/storage/proposal
-    section 
+    section
+- 4.6.6
+-------------------------------------------------------------------
+Thu Feb 15 09:09:59 UTC 2024 - Ladislav Slezák <lslezak@suse.com>
+
+- Install standard SLES when the AY XML profile selects SLE_HPC,
+  it has been dropped in SP6 (jsc#PED-7841)
 - 4.6.5
 
 -------------------------------------------------------------------

package/autoyast2.spec

@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.6.5
+Version:        4.6.6
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only

src/modules/AutoinstFunctions.rb

@@ -8,6 +8,13 @@ module Yast
   class AutoinstFunctionsClass < Module
     include Yast::Logger
 
+    # special mapping for handling dropped or renamed products,
+    # a map with <old product name> => <new_product name> values
+    PRODUCT_MAPPING = {
+      # the SLE_HPC product was dropped and replaced by standard SLES in SP6
+      "SLE_HPC" => "SLES"
+    }.freeze
+
     def main
       textdomain "installation"
 
@@ -220,7 +227,7 @@ def identify_product_by_selection(profile)
     # FIXME: Currently it returns first found product name. It should be no
     # problem since this section was unused in AY installation so far.
     # However, it might be needed to add a special handling for multiple
-    # poducts in the future. At least we can filter out products which are
+    # products in the future. At least we can filter out products which are
     # not base products.
     #
     # @param profile [Hash] AutoYaST profile
@@ -234,7 +241,15 @@ def base_product_name(profile)
         return nil
       end
 
-      software.fetch_as_array("products").first
+      product = software.fetch_as_array("products").first
+      new_product = PRODUCT_MAPPING[product]
+
+      if new_product
+        log.info "Replacing requested product #{product.inspect} with #{new_product.inspect}"
+        return new_product
+      end
+
+      product
     end
   end