SL Micro and OpenSuse Leap Micro 6.1 Support (#3584)

* add sl micro and OpenSuse Leap Micro 6.1 support * add ppc64le * fix typo * update matrix
uyuni-project · Jan 8, 2025 · 4d2ffd4 · 4d2ffd4
1 parent bccca1e
commit 4d2ffd4
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 18 deletions.
diff --git a/modules/client-configuration/pages/clients-opensuseleapmicro.adoc b/modules/client-configuration/pages/clients-opensuseleapmicro.adoc
@@ -25,11 +25,11 @@ ifeval::[{suma-content} == true]
 | OS Version
 | Product Name
 
-| {leapmicro} 5.3
-| {leapmicro} 5.3 {x86_64}
+| {leapmicro} {microversion}
+| {leapmicro} {microversion} {x86_64}
 
-| {leapmicro} 5.3
-| {leapmicro} 5.3 {aarch64}
+| {leapmicro} {microversion}
+| {leapmicro} {microversion} {aarch64}
 
 |===
 
@@ -55,14 +55,14 @@ endif::[]
 
 ifeval::[{uyuni-content} == true]
 [[opensuse-leapmicro-channels-cli]]
-[cols="1,1,1,1", options="header"]
+[cols="1,1,1,1,1", options="header"]
 .{opensuse} Channels - CLI
 |===
 
-| OS Version               | {leapmicro} 5.5                    | {leapmicro} 5.4                | {leapmicro} 5.3
-| Base Channel             | opensuse_micro5_5                  | opensuse_micro5_4              | opensuse_micro5_3
-| Client Channel           | opensuse_micro5_5-uyuni-client     | opensuse_micro5_4-uyuni-client | opensuse_micro5_3-uyuni-client
-| SLE Updates Channel      | opensuse_micro5_5-sle-updates      | opensuse_micro5_4-sle-updates  | opensuse_micro5_3-sle-updates
+| OS Version               | {leapmicro} {microversion}     | {leapmicro} 5.5                    | {leapmicro} 5.4                | {leapmicro} 5.3
+| Base Channel             | opensuse_micro6_1              | opensuse_micro5_5                  | opensuse_micro5_4              | opensuse_micro5_3
+| Client Channel           | opensuse_micro6_1-uyuni-client | opensuse_micro5_5-uyuni-client     | opensuse_micro5_4-uyuni-client | opensuse_micro5_3-uyuni-client
+| SLE Updates Channel      | NA                             | opensuse_micro5_5-sle-updates      | opensuse_micro5_4-sle-updates  | opensuse_micro5_3-sle-updates
 
 |===
 

diff --git a/modules/client-configuration/pages/clients-slmicro.adoc b/modules/client-configuration/pages/clients-slmicro.adoc
@@ -24,9 +24,32 @@ include::snippets/arch-other-note.adoc[]
 
 The products you need for this procedure are:
 
-[[slmicro-channels-wizard]]
+
+[[slmicro-channels-wizard-61]]
 [cols="1,1", options="header"]
-.SL Micro Products - WebUI
+.{sl-micro} {microversion} Products - WebUI
+|===
+
+| OS Version
+| Product Name
+
+| {sl-micro} 6.1 {x86_64}
+| SUSE Linux Micro 6.1 x86_64
+
+| {sl-micro} 6.1 {arm64}
+| SUSE Linux Micro 6.1 arch64
+
+| {sl-micro} 6.1 {s390x}
+| SUSE Linux Micro 6.1 s390x
+
+| {sl-micro} 6.1 {ppc64le}
+| SUSE Linux Micro 6.1 ppc64le
+
+|===
+
+[[slmicro-channels-wizard-60]]
+[cols="1,1", options="header"]
+.{sl-micro} 6.0 Products - WebUI
 |===
 
 | OS Version
@@ -49,9 +72,25 @@ include::snippets/addchannels_vendor_webui.adoc[]
 Alternatively, you can add channels at the command prompt.
 The channels you need for this procedure are:
 
-[[slmicro-channels-cli]]
+// 6.1 from command line
+[[slmicro-channels-cli-61]]
+[cols="1,1", options="header"]
+.{sl-micro} {microversion} Products - CLI
+|===
+
+| OS Version
+| Base Channel
+
+| {sl-micro} 6.1 {x86_64}
+| sl-micro-6.1-pool-x86_64
+
+|===
+
+
+// 6.0 from command line
+[[slmicro-channels-cli-60]]
 [cols="1,1", options="header"]
-.SL Micro Products - CLI
+.{sl-micro} 6.0 Products - CLI
 |===
 
 | OS Version

diff --git a/modules/client-configuration/pages/supported-features.adoc b/modules/client-configuration/pages/supported-features.adoc
@@ -50,13 +50,13 @@ ifeval::[{suma-content} == true]
 | {cross}
 | {cross}
 
-| {sle-micro}
+| {sle-micro} 
 | {check}
 | {cross}
 | {cross}
 | {check}
 
-| {sl-micro}
+| {sl-micro} {microversion}, 6.0
 | {check}
 | {cross}
 | {cross}

diff --git a/parameters.yml b/parameters.yml
@@ -39,7 +39,7 @@ products:
       # For d.s.c use: https://documentation.suse.com/suma/5.0/
       # For the webui use: /
       - attribute: url
-        value: https://documentation.suse.com/suma/5.0/
+        value: /
     ui:
       bundle:
         - attribute: url
@@ -49,7 +49,7 @@ products:
           value: true
       # Adjusting this is not required anymore as this is handled
       # by the Makefile. Adjust the targets there if you need to
-      supplemental_files: ./branding/supplemental-ui/suma/susecom-2023
+      supplemental_files: ./branding/supplemental-ui/suma/webui-2023
   uyuni:
     antora:
       name: "uyuni"
@@ -231,7 +231,7 @@ asciidoc:
     - attribute: sl-micro
       value: 'SL Micro'
     - attribute: microversion
-      value: '5.5'
+      value: '6.1'
     - attribute: leap
       value: "openSUSE Leap"
     - attribute: leapmicro