Enable migration from 15SP6

Author: lemon-suse

data/yam/autoyast/ha.xml

@@ -22,27 +22,27 @@
         <version>{{VERSION}}</version>
         <arch>{{ARCH}}</arch>
       </addon>
-      % if ($check_var->('VERSION', '15-SP7') or $check_var->('VERSION', '15-SP6')) {
+      % if ( $get_var->('VERSION') =~ /15-SP[6-7]/ ) {
       <addon>
         <name>sle-module-systems-management</name>
         <version>{{VERSION}}</version>
         <arch>{{ARCH}}</arch>
       </addon>
       % }
-      <addon>
-        <name>sle-ha</name>
-        <reg_code>{{SCC_REGCODE_HA}}</reg_code>
-        <version>{{VERSION}}</version>
-        <arch>{{ARCH}}</arch>
-      </addon>
-      % if ($check_var->('VERSION', '15-SP4') or $check_var->('VERSION', '15-SP5') or $check_var->('VERSION', '15-SP6')) {
+      % if ( $get_var->('VERSION') =~ /15-SP[4-6]/ ) {
       <addon>
         <arch>{{ARCH}}</arch>
         <name>SLES-LTSS</name>
         <version>{{VERSION}}</version>
         <reg_code>{{SCC_REGCODE_LTSS}}</reg_code>
       </addon>
       % }
+      <addon>
+        <name>sle-ha</name>
+        <reg_code>{{SCC_REGCODE_HA}}</reg_code>
+        <version>{{VERSION}}</version>
+        <arch>{{ARCH}}</arch>
+      </addon>
     </addons>
   </suse_register>
   <general>

data/yam/autoyast/ha.xml.ep

@@ -22,14 +22,14 @@
         <version>{{VERSION}}</version>
         <arch>{{ARCH}}</arch>
       </addon>
-      % if ($check_var->('VERSION', '15-SP7') or $check_var->('VERSION', '15-SP6')) {
+      % if ( $get_var->('VERSION') =~ /15-SP[6-7]/ ) {
       <addon>
         <name>sle-module-systems-management</name>
         <version>{{VERSION}}</version>
         <arch>{{ARCH}}</arch>
       </addon>
       % }
-      % if ($check_var->('VERSION', '15-SP4') or $check_var->('VERSION', '15-SP5') or $check_var->('VERSION', '15-SP6')) {
+      % if ( $get_var->('VERSION') =~ /15-SP[4-6]/ ) {
       <addon>
         <arch>{{ARCH}}</arch>
         <name>SLES-LTSS</name>

data/yam/autoyast/ha_s390x.xml

@@ -77,7 +77,7 @@
   </software>
   <suse_register t="map">
     <addons t="list">
-      % if ($check_var->('VERSION', '15-SP6') or $check_var->('VERSION', '15-SP7')) {
+      % if ( $get_var->('VERSION') =~ /15-SP[6-7]/ ) {
       <addon t="map">
         <arch>{{ARCH}}</arch>
         <name>sle-module-systems-management</name>