Revert "create 3.2.1 release manifest"

This reverts commit 189db31b7f.
create 3.2.1 release manifest
2025-03-20 11:43:48 +02:00 · 2025-03-20 11:20:53 +02:00 · 2025-03-14 13:08:29 +01:00 · 2025-03-14 12:25:54 +02:00 · 2025-03-13 12:04:28 +00:00 · 2025-03-13 12:00:39 +00:00
21 changed files with 175 additions and 803 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 */.osc
 */__pycache__
-.venv/
-.idea/
+.venv/
--- a/.obs/common.py
+++ b/.obs/common.py
@@ -1,3 +1,3 @@
-PROJECT = "isv:SUSE:Edge:Factory:Devel"
+PROJECT = "isv:SUSE:Edge:3.2"
 REPOSITORY = "https://src.opensuse.org/suse-edge/Factory"
-BRANCH = "devel"
+BRANCH = "3.2"
--- a/.obs/trigger_package.py
+++ b/.obs/trigger_package.py
@@ -1,65 +0,0 @@
-import xml.etree.ElementTree as ET
-import subprocess
-
-from sync_packages import get_local_packages
-from common import PROJECT
-
-def get_service_repo(package):
-    with open(f"{package}/_service") as service:
-        root = ET.parse(service).getroot()
-        for service in root.findall("service"):
-            if service.get("mode") in ["manual", "disabled"]:
-                continue
-            if service.get("name") not in ["obs_scm", "tar_scm"]:
-                continue
-            ref = service.find("param[@name='revision']").text
-            repo = service.find("param[@name='url']").text
-            return (repo, ref)
-    return None
-    
-
-def get_remote_ref(project, package):
-    files = subprocess.run(["osc", "ls", "-e", project, package], encoding='utf-8' , capture_output=True).stdout.splitlines()
-    for filename in files:
-        if filename.startswith("_service") and filename.endswith(".obsinfo"):
-            obsinfo = subprocess.run(["osc", "cat", project, package, filename], encoding='utf-8' , capture_output=True).stdout.splitlines()
-            for line in obsinfo:
-                if line.startswith("commit:"):
-                    return line.split(':')[-1].strip()
-
-def get_upstream_ref(repo, ref):
-    refs = subprocess.run(["git", "ls-remote", repo, ref, f"{ref}^{{}}"], encoding='utf-8' , capture_output=True).stdout.splitlines()
-    refpath = ref.split('/')
-    best = None
-    for rref in refs:
-        value = rref.split('\t')
-        (sha, name) = (value[0].strip(), value[1].strip())
-        namepath = name.split('/')
-        if len(namepath) == len(refpath) or len(namepath) - 2 == len(refpath):
-            if name.endswith(ref) and best is None:
-                best = sha
-            if name.endswith("^{}"):
-                best = sha
-    return best
-
-def trigger_service(project, package):
-    subprocess.run(["osc", "service", "remoterun", project, package], encoding="utf-8",check=True)
-
-def main():
-    packages = get_local_packages()
-    for package in packages:
-        try:
-            (repo, ref) = get_service_repo(package)
-            print(f"{package} uses {repo} at {ref}")
-        except: # Package is not using server side scm service
-            continue
-        remote_ref = get_remote_ref(PROJECT, package)
-        upstream_ref = get_upstream_ref(repo, ref)
-        if upstream_ref != remote_ref:
-            print(f"\t{package} needs a refresh")
-            print(f"\tOBS ref is {remote_ref}")
-            print(f"\tgit ref is {upstream_ref}")
-            trigger_service(PROJECT, package)
-            
-if __name__ == "__main__":
-    main()
--- a/edge-image-builder-image/Dockerfile
+++ b/edge-image-builder-image/Dockerfile
@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%edge-image-builder:%PACKAGE_VERSION%
-#!BuildTag: %%IMG_PREFIX%%edge-image-builder:%PACKAGE_VERSION%-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.0
+#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.0-%RELEASE%
 #!BuildVersion: 15.6
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-base:$SLE_VERSION
@@ -15,11 +15,11 @@ RUN zypper --non-interactive install --no-recommends edge-image-builder qemu-x86
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE edge-image-builder Container Image"
 LABEL org.opencontainers.image.description="edge-image-builder based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="%PACKAGE_VERSION%"
+LABEL org.opencontainers.image.version="1.1.0"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:%PACKAGE_VERSION%-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.1.0-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
--- a/edge-image-builder-image/_service
+++ b/edge-image-builder-image/_service
@@ -1,10 +1,5 @@
 <services>
  <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
-      <param name="file">Dockerfile</param>
-      <param name="regex">%PACKAGE_VERSION%</param>
-      <param name="package">edge-image-builder</param>
-    </service>
  <service name="replace_using_env" mode="buildtime">
    <param name="file">Dockerfile</param>
    <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
--- a/edge-image-builder/_service
+++ b/edge-image-builder/_service
@@ -1,12 +1,12 @@
 <services>
  <service name="obs_scm">
    <param name="url">https://github.com/suse-edge/edge-image-builder.git</param>
-    <param name="versionformat">@PARENT_TAG@_%h.%ad</param>
+    <param name="versionformat">@PARENT_TAG@</param>
    <param name="scm">git</param>
    <param name="exclude">.git</param>
-    <param name="revision">main</param>
-    <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="versionrewrite-replacement">\1</param>
+    <param name="revision">v1.1.0</param>
+    <param name="versionrewrite-pattern">v(\d+).(\d+).(\d+)</param>
+    <param name="versionrewrite-replacement">\1.\2.\3</param>
    <param name="changesgenerate">enable</param>
  </service>
  <service mode="buildtime" name="tar">
@@ -16,4 +16,4 @@
  <service name="go_modules">
     <param name="compression">gz</param>
  </service>
-</services>
+</services>
--- a/edge-image-builder/edge-image-builder.spec
+++ b/edge-image-builder/edge-image-builder.spec
@@ -17,7 +17,7 @@


 Name:           edge-image-builder
-Version:        0
+Version:        1.1.0
 Release:        0
 Summary:        Edge Image Builder
 License:        Apache-2.0
--- a/ironic-image/Dockerfile
+++ b/ironic-image/Dockerfile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.2
-#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.2-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.3
+#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.3-%RELEASE%
 #!BuildVersion: 15.6

 ARG SLE_VERSION
@@ -46,8 +46,8 @@ LABEL org.opencontainers.image.description="Openstack Ironic based on the SLE Ba
 LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opencontainers.image.version="26.1.2.2"
-LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:26.1.2.2-%RELEASE%"
+LABEL org.opencontainers.image.version="26.1.2.3"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:26.1.2.3-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
--- a/ironic-image/apache2-vmedia.conf.j2
+++ b/ironic-image/apache2-vmedia.conf.j2
@@ -10,17 +10,15 @@ Listen {{ env.VMEDIA_TLS_PORT }}
    SSLCertificateFile {{ env.IRONIC_VMEDIA_CERT_FILE }}
    SSLCertificateKeyFile {{ env.IRONIC_VMEDIA_KEY_FILE }}

-    <Directory ~ "/shared/html">
-         Order deny,allow
-         deny from all
+    <Directory "/shared">
+        AllowOverride None
+        Require all granted
    </Directory>
-    <Directory ~ "/shared/html/(redfish|ilo)/">
-         Order allow,deny
-         allow from all
-    </Directory>
-    <Directory ~ "/shared/html/images/">
-         Order allow,deny
-         allow from all
+
+    <Directory "/shared/html">
+        Options Indexes FollowSymLinks
+        AllowOverride None
+        Require all granted
    </Directory>
 </VirtualHost>

--- a/ironic-image/ironic.conf.j2
+++ b/ironic-image/ironic.conf.j2
@@ -83,7 +83,7 @@ send_sensor_data = {{ env.SEND_SENSOR_DATA }}
 # Power state is checked every 60 seconds and BMC activity should
 # be avoided more often than once every sixty seconds.
 send_sensor_data_interval = 160
-bootloader = http://{{ env.IRONIC_URL_HOST }}:{{ env.HTTP_PORT }}/uefi_esp.img
+bootloader = {{ env.IRONIC_BOOT_BASE_URL }}/uefi_esp.img
 verify_step_priority_override = management.clear_job_queue:90
 # We don't use this feature, and it creates an additional load on the database
 node_history = False
@@ -112,7 +112,7 @@ default_boot_option = local
 erase_devices_metadata_priority = 10
 erase_devices_priority = 0
 http_root = /shared/html/
-http_url = http://{{ env.IRONIC_URL_HOST }}:{{ env.HTTP_PORT }}
+http_url = {{ env.IRONIC_BOOT_BASE_URL }}
 fast_track = {{ env.IRONIC_FAST_TRACK }}
 {% if env.IRONIC_BOOT_ISO_SOURCE %}
 ramdisk_image_download_source = {{ env.IRONIC_BOOT_ISO_SOURCE }}
--- a/kiwi-builder-image/Dockerfile
+++ b/kiwi-builder-image/Dockerfile
@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.1.16.1
-#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.1.16.1-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.1.16.0
+#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.1.16.0-%RELEASE%
 FROM registry.suse.com/bci/kiwi:10.1.16
 MAINTAINER SUSE LLC (https://www.suse.com/)

@@ -12,7 +12,7 @@ LABEL org.opencontainers.image.version="%PACKAGE_VERSION%"
 LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%kiwi-builder:10.1.16.1"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%kiwi-builder:10.1.16.0"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
--- a/kiwi-builder-image/README
+++ b/kiwi-builder-image/README
@@ -2,13 +2,13 @@
 Kiwi SDK Image Instructions
 ###########################

-Please ensure that you're running this on a registered SUSE Linux Micro 6.1 system, and make sure that SELinux is disabled:
+Please ensure that you're running this on a registered SLE Micro 6.0 system, and make sure that SELinux is disabled:

 # setenforce 0

 Next, download the podman image:

-# podman pull %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.1
+# podman pull %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0

 Make a local output directory (where the images will reside):

@@ -16,40 +16,40 @@ Make a local output directory (where the images will reside):

 Then, to build a standard "Base" image, run the following in podman:

-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.1 build-image
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image

 To build a "Base" SelfInstall ISO, you can add additional flags, for example:

-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.1 build-image -p Base-SelfInstall
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Base-SelfInstall

 Then, to build a standard "Default" image, run the following in podman:

-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.1 build-image -p Default
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Default

 To build a "Default" SelfInstall ISO, you can add additional flags, for example:

-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.1 build-image -p Default-SelfInstall
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Default-SelfInstall

 To build an image with a RealTime kernel, e.g. a RAW disk image ("Default"), use the following:

-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.1 build-image -p Base-RT
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Base-RT

 To build an image that supports a large block/sectorsize (4096), use the "-b" flag, for example:

-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.1 build-image -p Default-SelfInstall -b
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Default-SelfInstall -b

 # mkdir mydefs/
 # cp /path/to/SL-Micro.kiwi mydefs/
 # cp /path/to/config.sh mydefs/
-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -v ./mydefs/:/micro-sdk/defs/ -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.1 build-image
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -v ./mydefs/:/micro-sdk/defs/ -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image

 All output will be in the local $(pwd)/output directory, for example:

 # ls -1 output/
-SLE-Micro.x86_64-6.1.changes
-SLE-Micro.x86_64-6.1.packages
-SLE-Micro.x86_64-6.1.raw
-SLE-Micro.x86_64-6.1.verified
+SLE-Micro.x86_64-6.0.changes
+SLE-Micro.x86_64-6.0.packages
+SLE-Micro.x86_64-6.0.raw
+SLE-Micro.x86_64-6.0.verified
 build
 kiwi.result
 kiwi.result.json
--- a/kiwi-builder-image/SL-Micro.kiwi
+++ b/kiwi-builder-image/SL-Micro.kiwi
@@ -33,12 +33,6 @@
        <profile name="aarch64-self_install" description="Raw disk for aarch64" arch="aarch64">
            <requires profile="bootloader"/>
        </profile>
-        <profile name="aarch64-rt" description="Raw disk for aarch64 with RT kernel" arch="aarch64">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="aarch64-rt-self_install" description="Raw disk for aarch64 with RT kernel" arch="aarch64">
-            <requires profile="bootloader"/>
-        </profile>
        <profile name="x86-legacy" description="Raw disk for x86_64 - legacy boot" arch="x86_64">
            <requires profile="bootloader"/>
        </profile>
@@ -69,21 +63,6 @@
        <profile name="s390-fba" description="Raw disk for s390 - DASD" arch="s390x">
            <requires profile="bootloader"/>
        </profile>
-        <profile name="s390-fcp" description="Raw disk for s390 - SCSI" arch="s390x">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-512ss" description="Raw disk for PPc64 - 512 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-4096ss" description="Raw disk for PPc64 - 4096 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-512ss-self_install" description="Raw disk for PPc64 - 512 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-4096ss-self_install" description="Raw disk for PPc64 - 4096 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
        <!-- Images (flavor + platform) -->
        <profile name="Default" description="SL Micro with Podman and KVM as raw image with uEFI boot" arch="x86_64">
            <requires profile="full"/>
@@ -161,15 +140,6 @@
            <requires profile="x86-rt-self_install"/>
            <requires profile="self_install"/>
        </profile>
-        <profile name="Base-RT" description="SL Micro with Podman as raw image with uEFI boot" arch="aarch64">
-            <requires profile="container-host"/>
-            <requires profile="aarch64-rt"/>
-        </profile>
-        <profile name="Base-RT-SelfInstall" description="SL Micro with Podman as raw image with uEFI boot - SelfInstall" arch="aarch64">
-            <requires profile="container-host"/>
-            <requires profile="aarch64-rt-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
        <profile name="Default-qcow" description="SL Micro with Podman and KVM as raw image for KVM on System z" arch="s390x">
            <requires profile="full"/>
            <requires profile="s390-kvm"/>
@@ -194,14 +164,6 @@
            <requires profile="container-host"/>
            <requires profile="s390-fba"/>
        </profile>
-        <profile name="Default-fcp" description="SL Micro with Podman and KVM as raw image for zFCP on System z" arch="s390x">
-            <requires profile="full"/>
-            <requires profile="s390-fcp"/>
-        </profile>
-        <profile name="Base-fcp" description="SL Micro with Podman as raw image for zFCP on System z" arch="s390x">
-            <requires profile="container-host"/>
-            <requires profile="s390-fcp"/>
-        </profile>
        <profile name="Default-legacy" description="SL Micro with Podman as raw image with legacy boot" arch="x86_64">
            <requires profile="full"/>
            <requires profile="x86-legacy"/>
@@ -222,47 +184,10 @@
 	    <requires profile="container-host"/>
 	    <requires profile="aarch64-qcow"/>
        </profile>
-
-	<profile name="Base-512" description="SL Micro with Podman as raw image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-512ss"/>
-        </profile>
-	<profile name="Base-4096" description="SL Micro with Podman as raw image for ppc64le with 4096b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-4096ss"/>
-        </profile>
-	<profile name="Base-512-SelfInstall" description="SL Micro with Podman as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-512ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
-	<profile name="Base-4096-SelfInstall" description="SL Micro with Podman as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-4096ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
-	<profile name="Default-512" description="SL Micro with Podman and KVM as raw image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-512ss"/>
-        </profile>
-	<profile name="Default-4096" description="SL Micro with Podman and KVM as raw image for ppc64le with 4096b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-4096ss"/>
-        </profile>
-	<profile name="Default-512-SelfInstall" description="SL Micro with Podman and KVM as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-512ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
-	<profile name="Default-4096-SelfInstall" description="SL Micro with Podman and KVM as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-4096ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
    </profiles>

    <preferences profiles="x86-encrypted,x86-rt-encrypted">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -273,7 +198,7 @@
            initrd_system="dracut"
            filesystem="btrfs"
            firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
            bootpartition="false"
            bootkernel="custom"
            devicepersistency="by-uuid"
@@ -286,7 +211,7 @@
 	    luks_pbkdf="pbkdf2"
        >
            <luksformat>
-                <option name="--cipher" value="aes-xts-plain64"/>
+                <option name="--cipher" value="aes"/>
            </luksformat>
            <bootloader name="grub2" console="gfxterm" use_disk_password="true" />
            <systemdisk>
@@ -305,7 +230,7 @@
        </type>
    </preferences>
    <preferences profiles="x86,x86-rt">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -316,7 +241,7 @@
            initrd_system="dracut"
            filesystem="btrfs"
            firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
            bootpartition="false"
            bootkernel="custom"
            devicepersistency="by-uuid"
@@ -341,7 +266,7 @@
    </preferences>

    <preferences profiles="x86-self_install,x86-rt-self_install">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -351,12 +276,11 @@
            image="oem"
            initrd_system="dracut"
            installiso="true"
-            installpxe="true"
            filesystem="btrfs"
            installboot="install"
            install_continue_on_timeout="false"
            firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
            bootpartition="false"
            bootkernel="custom"
            devicepersistency="by-uuid"
@@ -380,8 +304,8 @@
        </type>
    </preferences>

-    <preferences profiles="rpi,aarch64-rt">
-        <version>6.1</version>
+    <preferences profiles="rpi">
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -396,11 +320,11 @@
            install_continue_on_timeout="false"
            fsmountoptions="noatime"
            firmware="uefi"
-            kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200n8 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
            bootpartition="false"
            devicepersistency="by-uuid"
            btrfs_root_is_snapshot="true"
-            efipartsize="128"
+            efipartsize="128"     
            editbootinstall="editbootinstall_rpi.sh"
            btrfs_root_is_readonly_snapshot="true"
            btrfs_quota_groups="false"
@@ -420,8 +344,8 @@
            </systemdisk>
        </type>
    </preferences>
-    <preferences profiles="aarch64-self_install,aarch64-rt-self_install">
-        <version>6.1</version>
+    <preferences profiles="aarch64-self_install">
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -431,13 +355,12 @@
            image="oem"
            initrd_system="dracut"
            installiso="true"
-            installpxe="true"
            filesystem="btrfs"
            installboot="install"
            install_continue_on_timeout="false"
            firmware="uefi"
-            efipartsize="128"
-            kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            efipartsize="128"     
+	    kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
            bootpartition="false"
            bootkernel="custom"
            devicepersistency="by-uuid"
@@ -462,22 +385,22 @@
    </preferences>

    <preferences profiles="s390-kvm">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
        <rpm-excludedocs>true</rpm-excludedocs>
        <locale>en_US</locale>
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
+
        <type
            image="oem"
            filesystem="btrfs"
            bootpartition="true"
            bootpartsize="300"
-            bootfilesystem="ext4"
+            bootfilesystem="ext2"
        initrd_system="dracut"
        format="qcow2"
-            kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 ignition.platform.id=metal"
+            kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet"
        devicepersistency="by-uuid"
            btrfs_root_is_snapshot="true"
            btrfs_root_is_readonly_snapshot="true"
@@ -500,7 +423,7 @@


    <preferences profiles="s390-dasd">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -511,9 +434,9 @@
          filesystem="btrfs"
          bootpartition="true"
          bootpartsize="300"
-          bootfilesystem="ext4"
+          bootfilesystem="ext2"
          initrd_system="dracut"
-          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1"
+          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet"
          devicepersistency="by-uuid"
          target_blocksize="4096"
          btrfs_root_is_snapshot="true"
@@ -538,7 +461,7 @@


    <preferences profiles="s390-fba">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -549,9 +472,9 @@
          filesystem="btrfs"
          bootpartition="true"
          bootpartsize="300"
-          bootfilesystem="ext4"
+          bootfilesystem="ext2"
          initrd_system="dracut"
-          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1"
+          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet"
          devicepersistency="by-uuid"
          btrfs_root_is_snapshot="true"
          btrfs_root_is_readonly_snapshot="true"
@@ -572,47 +495,9 @@
        </type>
    </preferences>

-    <preferences profiles="s390-fcp">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <type
-          image="oem"
-          filesystem="btrfs"
-          installpxe="true"
-          bootpartition="true"
-          bootpartsize="300"
-          bootfilesystem="ext4"
-          initrd_system="dracut"
-          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1"
-          devicepersistency="by-uuid"
-          btrfs_root_is_snapshot="true"
-          btrfs_root_is_readonly_snapshot="true"
-          btrfs_quota_groups="true"
-        >
-            <oemconfig>
-                <oem-multipath-scan>true</oem-multipath-scan>
-            </oemconfig>
-            <bootloader name="grub2_s390x_emu" console="serial" timeout="3" targettype="SCSI"/>
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/s390x-emu" mountpoint="boot/grub2/s390x-emu"/>
-                <volume name="boot/writable"/>
-                <volume name="usr/local"/>
-                <volume name="var" copy_on_write="false"/>
-            </systemdisk>
-            <size unit="G">5</size>
-        </type>
-    </preferences>

    <preferences profiles="x86-vmware">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -647,7 +532,7 @@
        </type>
    </preferences>
    <preferences profiles="x86-qcow">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -658,7 +543,7 @@
            format="qcow2"
            filesystem="btrfs"
            firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=qemu"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=qemu"
            bootpartition="false"
            bootkernel="custom"
            devicepersistency="by-uuid"
@@ -682,9 +567,9 @@
            <size unit="G">32</size>
        </type>
    </preferences>
-
+ 
    <preferences profiles="aarch64-qcow">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -695,8 +580,8 @@
            format="qcow2"
            filesystem="btrfs"
            firmware="uefi"
-            efipartsize="128"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=qemu"
+            efipartsize="128"     
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=qemu"
            bootpartition="false"
            bootkernel="custom"
            devicepersistency="by-uuid"
@@ -707,7 +592,7 @@
            <systemdisk>
                <volume name="home"/>
                <volume name="root"/>
-                <volume name="opt"/>
+ 		<volume name="opt"/>
                <volume name="srv"/>
                <volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
                <volume name="boot/writable"/>
@@ -718,161 +603,6 @@
        </type>
    </preferences>

-    <preferences profiles="ppc64le-512ss">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-    <preferences profiles="ppc64le-4096ss">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- TODO: supposedly this is needed as type attribute, but kiwi needs patching
-             disk_start_sector="256" -->
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            target_blocksize="4096"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-
-    <preferences profiles="ppc64le-512ss-self_install">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            installiso="true"
-            installpxe="true"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <installmedia>
-                <initrd action="omit">
-                    <dracut module="drm"/>
-                </initrd>
-            </installmedia>
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-    <preferences profiles="ppc64le-4096ss-self_install">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- TODO: supposedly this is needed as type attribute, but kiwi needs patching
-             disk_start_sector="256" -->
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            installiso="true"
-            installpxe="true"
-            target_blocksize="4096"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <installmedia>
-                <initrd action="omit">
-                    <dracut module="drm"/>
-                </initrd>
-            </installmedia>
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-
-
   <repository type="rpm-md" >
        <source path='obsrepositories:/'/>
    </repository>
@@ -886,7 +616,7 @@
 	<package name="patterns-base-kvm_host"/>
 	<package name="lzop"/>
        <namedCollection name="container_runtime_podman"/>
-        <package name="patterns-container-runtime_podman"/>
+        <package name="patterns-container-runtime_podman"/> 
        <namedCollection name="cockpit"/>
        <package name="patterns-base-cockpit"/>
        <namedCollection name="selinux"/>
@@ -898,6 +628,7 @@
        <package name="firewalld"/>
        <package name="wpa_supplicant" arch="x86_64,aarch64"/>
 	<package name="libpwquality-tools"/>
+        <!-- <package name="k3s-install"/> -->
    </packages>

    <packages type="image" profiles="x86-encrypted,x86-rt-encrypted">
@@ -916,7 +647,9 @@
        <namedCollection name="base_transactional"/>
        <package name="patterns-base-transactional"/>
        <namedCollection name="container_runtime_podman"/>
-        <package name="patterns-container-runtime_podman"/>
+        <package name="patterns-container-runtime_podman"/> 
+        <namedCollection name="cockpit"/>
+        <package name="patterns-base-cockpit"/>
        <namedCollection name="selinux"/>
        <package name="patterns-base-selinux"/>
        <package name="suseconnect-ng"/>
@@ -970,7 +703,7 @@
        <package name="NetworkManager"/>
        <package name="NetworkManager-branding-SLE"/>
 	<package name="ModemManager"/>
-	<!-- FIXME does not build without control file which is obsolete
+	<!-- FIXME does not build without control file which is obsolete 
 	<package name="live-add-yast-repos"/> -->
 	<package name="parted"/> <!-- seems missing to deploy the image -->
    </packages>
@@ -980,8 +713,7 @@
        <package name="grub2-x86_64-efi" arch="x86_64"/>
        <package name="grub2-arm64-efi" arch="aarch64"/>
        <package name="grub2-s390x-emu" arch="s390x"/>
-        <package name="grub2-powerpc-ieee1275" arch="ppc64le"/>
-        <package name="grub2-branding-SLE" bootinclude="true" arch="x86_64,aarch64,ppc64le"/>
+        <package name="grub2-branding-SLE" bootinclude="true" arch="x86_64,aarch64"/>
        <package name="grub2-snapper-plugin"/>
        <package name="shim" arch="x86_64,aarch64"/>
 	<package name="mokutil" arch="x86_64,aarch64"/>
@@ -989,44 +721,46 @@
 	    <package name="kpartx" arch="s390x"/>--> <!-- previous releases picked it always, now kiwi picks partx instead -->
    </packages>
    <!-- rpi kernel-default-base does not provide all necessary drivers -->
-    <packages type="image" profiles="rpi,aarch64-self_install,x86,x86-encrypted,x86-legacy,x86-self_install,x86-vmware,x86-qcow,aarch64-qcow,s390-kvm,s390-dasd,s390-fba,s390-fcp,ppc64le-512ss,ppc64le-4096ss,ppc64le-512ss-self_install,ppc64le-4096ss-self_install">
+    <packages type="image" profiles="x86,x86-encrypted,x86-legacy,x86-self_install,x86-vmware,x86-qcow,aarch64-qcow,s390-kvm,s390-dasd,s390-fba">
        <package name="kernel-default"/>
        <package name="kernel-firmware-all"/>
    </packages>
-    <packages type="image" profiles="x86-rt,x86-rt-self_install,x86-rt-encrypted,aarch64-rt,aarch64-rt-self_install">
+    <packages type="image" profiles="x86-rt,x86-rt-self_install,x86-rt-encrypted">
        <package name="kernel-rt"/>
-        <package name="kernel-firmware-all"/>
-	<!-- FIXME intentionally removed from ALP code stream
-        <package name="cpuset"/> -->
+	<package name="kernel-firmware-all"/>
+	<!-- FIXME intentionally removed from ALP code stream 
+	<package name="cpuset"/> -->
    </packages>
-    <packages type="image" profiles="s390-kvm,s390-dasd,s390-fba,s390-fcp">
-        <package name="dracut-kiwi-oem-dump"/>
+    <!-- makes the image build, but also include kernel-default
+    <packages type="image" profiles="x86-rt-encrypted">
+        <package name="kernel-default-extra"/>
+    </packages> -->
+    <packages type="image" profiles="s390-kvm,s390-dasd,s390-fba">
        <package name="dracut-kiwi-oem-repart"/>
        <package name="blog"/>
    </packages>
-    <!-- FCP is usually used multipathed. -->
-    <packages type="image" profiles="s390-fcp">
-        <package name="multipath-tools"/>
-    </packages>
-    <packages type="image" profiles="x86,x86-encrypted,x86-rt-encrypted,x86-self_install,x86-legacy,x86-vmware,x86-rt,x86-rt-self_install,x86-qcow,aarch64-qcow,rpi,aarch64-self_install,aarch64-rt,aarch64-rt-self_install,ppc64le-512ss,ppc64le-4096ss,ppc64le-512ss-self_install,ppc64le-4096ss-self_install">
+    <packages type="image" profiles="x86,x86-encrypted,x86-rt-encrypted,x86-self_install,x86-legacy,x86-vmware,x86-rt,x86-rt-self_install,x86-qcow,aarch64-qcow,rpi,aarch64-self_install">
        <package name="dracut-kiwi-oem-repart"/>
        <package name="dracut-kiwi-oem-dump"/>
    </packages>
-    <packages type="image" profiles="rpi,aarch64-self_install,aarch64-rt,aarch64-rt-self_install">
+    <packages type="image" profiles="rpi,aarch64-self_install">
        <package name="raspberrypi-firmware" arch="aarch64"/>
        <package name="raspberrypi-firmware-config" arch="aarch64"/>
        <package name="raspberrypi-firmware-dt" arch="aarch64"/>
        <package name="u-boot-rpiarm64" arch="aarch64"/>
        <package name="dracut-kiwi-oem-repart"/>
        <package name="bcm43xx-firmware"/>
+        <package name="kernel-firmware-all"/><!-- Fix choice between kernel-firmware and kernel-firmware-all -->
        <package name="wireless-regdb"/>
        <package name="wireless-tools"/>
        <package name="wpa_supplicant"/>
        <package name="grub2-arm64-efi"/>
+        <!-- kernel-default-base does not have all required drivers -->
+        <package name="kernel-default"/>
    </packages>
    <packages type="bootstrap">
-        <package name="filesystem"/>
        <package name="coreutils"/>
+        <package name="filesystem"/>
        <package name="ca-certificates"/>
        <package name="ca-certificates-mozilla"/>
    </packages>
@@ -1040,14 +774,4 @@
    <packages type="image" profiles="x86-qcow,aarch64-qcow">
        <package name="qemu-guest-agent"/>
    </packages>
-
-    <!-- jsc#PED-8599 -->
-    <packages type="image" profiles="Base,Base-encrypted,Base-RT,Base-RT-encrypted,Base-fba,Base-dasd,Base-fcp,Base-512,Base-4096,Default,Default-encrypted,Default-fba,Default-dasd,Default-fcp,Default-512,Default-4096">
-        <package name="usbguard"/>
-    </packages>
-
-    <!-- jsc#PED-8788 -->
-    <packages type="image" profiles="Base-RT,Base-RT-encrypted,x86-rt-encrypted,x86-rt,x86-rt-self_install,aarch64-rt,aarch64-rt-self_install">
-        <package name="stalld"/>
-    </packages>
 </image>
--- a/kiwi-builder-image/SL-Micro.kiwi.4096
+++ b/kiwi-builder-image/SL-Micro.kiwi.4096
@@ -33,12 +33,6 @@
        <profile name="aarch64-self_install" description="Raw disk for aarch64" arch="aarch64">
            <requires profile="bootloader"/>
        </profile>
-        <profile name="aarch64-rt" description="Raw disk for aarch64 with RT kernel" arch="aarch64">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="aarch64-rt-self_install" description="Raw disk for aarch64 with RT kernel" arch="aarch64">
-            <requires profile="bootloader"/>
-        </profile>
        <profile name="x86-legacy" description="Raw disk for x86_64 - legacy boot" arch="x86_64">
            <requires profile="bootloader"/>
        </profile>
@@ -69,21 +63,6 @@
        <profile name="s390-fba" description="Raw disk for s390 - DASD" arch="s390x">
            <requires profile="bootloader"/>
        </profile>
-        <profile name="s390-fcp" description="Raw disk for s390 - SCSI" arch="s390x">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-512ss" description="Raw disk for PPc64 - 512 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-4096ss" description="Raw disk for PPc64 - 4096 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-512ss-self_install" description="Raw disk for PPc64 - 512 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-4096ss-self_install" description="Raw disk for PPc64 - 4096 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
        <!-- Images (flavor + platform) -->
        <profile name="Default" description="SL Micro with Podman and KVM as raw image with uEFI boot" arch="x86_64">
            <requires profile="full"/>
@@ -161,15 +140,6 @@
            <requires profile="x86-rt-self_install"/>
            <requires profile="self_install"/>
        </profile>
-        <profile name="Base-RT" description="SL Micro with Podman as raw image with uEFI boot" arch="aarch64">
-            <requires profile="container-host"/>
-            <requires profile="aarch64-rt"/>
-        </profile>
-        <profile name="Base-RT-SelfInstall" description="SL Micro with Podman as raw image with uEFI boot - SelfInstall" arch="aarch64">
-            <requires profile="container-host"/>
-            <requires profile="aarch64-rt-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
        <profile name="Default-qcow" description="SL Micro with Podman and KVM as raw image for KVM on System z" arch="s390x">
            <requires profile="full"/>
            <requires profile="s390-kvm"/>
@@ -194,14 +164,6 @@
            <requires profile="container-host"/>
            <requires profile="s390-fba"/>
        </profile>
-        <profile name="Default-fcp" description="SL Micro with Podman and KVM as raw image for zFCP on System z" arch="s390x">
-            <requires profile="full"/>
-            <requires profile="s390-fcp"/>
-        </profile>
-        <profile name="Base-fcp" description="SL Micro with Podman as raw image for zFCP on System z" arch="s390x">
-            <requires profile="container-host"/>
-            <requires profile="s390-fcp"/>
-        </profile>
        <profile name="Default-legacy" description="SL Micro with Podman as raw image with legacy boot" arch="x86_64">
            <requires profile="full"/>
            <requires profile="x86-legacy"/>
@@ -222,47 +184,10 @@
 	    <requires profile="container-host"/>
 	    <requires profile="aarch64-qcow"/>
        </profile>
-
-	<profile name="Base-512" description="SL Micro with Podman as raw image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-512ss"/>
-        </profile>
-	<profile name="Base-4096" description="SL Micro with Podman as raw image for ppc64le with 4096b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-4096ss"/>
-        </profile>
-	<profile name="Base-512-SelfInstall" description="SL Micro with Podman as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-512ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
-	<profile name="Base-4096-SelfInstall" description="SL Micro with Podman as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-4096ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
-	<profile name="Default-512" description="SL Micro with Podman and KVM as raw image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-512ss"/>
-        </profile>
-	<profile name="Default-4096" description="SL Micro with Podman and KVM as raw image for ppc64le with 4096b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-4096ss"/>
-        </profile>
-	<profile name="Default-512-SelfInstall" description="SL Micro with Podman and KVM as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-512ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
-	<profile name="Default-4096-SelfInstall" description="SL Micro with Podman and KVM as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-4096ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
    </profiles>

    <preferences profiles="x86-encrypted,x86-rt-encrypted">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -273,7 +198,7 @@
            initrd_system="dracut"
            filesystem="btrfs"
            firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
            bootpartition="false"
            bootkernel="custom"
            devicepersistency="by-uuid"
@@ -288,7 +213,7 @@
            efipartsize="200"
        >
            <luksformat>
-                <option name="--cipher" value="aes-xts-plain64"/>
+                <option name="--cipher" value="aes"/>
            </luksformat>
            <bootloader name="grub2" console="gfxterm" use_disk_password="true" />
            <systemdisk>
@@ -307,7 +232,7 @@
        </type>
    </preferences>
    <preferences profiles="x86,x86-rt">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -318,7 +243,7 @@
            initrd_system="dracut"
            filesystem="btrfs"
            firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
            bootpartition="false"
            bootkernel="custom"
            devicepersistency="by-uuid"
@@ -345,7 +270,7 @@
    </preferences>

    <preferences profiles="x86-self_install,x86-rt-self_install">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -355,12 +280,11 @@
            image="oem"
            initrd_system="dracut"
            installiso="true"
-            installpxe="true"
            filesystem="btrfs"
            installboot="install"
            install_continue_on_timeout="false"
            firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
            bootpartition="false"
            bootkernel="custom"
            devicepersistency="by-uuid"
@@ -386,8 +310,8 @@
        </type>
    </preferences>

-    <preferences profiles="rpi,aarch64-rt">
-        <version>6.1</version>
+    <preferences profiles="rpi">
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -402,7 +326,7 @@
            install_continue_on_timeout="false"
            fsmountoptions="noatime"
            firmware="uefi"
-            kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200n8 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
            bootpartition="false"
            devicepersistency="by-uuid"
            btrfs_root_is_snapshot="true"
@@ -426,8 +350,8 @@
            </systemdisk>
        </type>
    </preferences>
-    <preferences profiles="aarch64-self_install,aarch64-rt-self_install">
-        <version>6.1</version>
+    <preferences profiles="aarch64-self_install">
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -437,13 +361,12 @@
            image="oem"
            initrd_system="dracut"
            installiso="true"
-            installpxe="true"
            filesystem="btrfs"
            installboot="install"
            install_continue_on_timeout="false"
            firmware="uefi"
            efipartsize="128"
-            kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+	    kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
            bootpartition="false"
            bootkernel="custom"
            devicepersistency="by-uuid"
@@ -468,22 +391,22 @@
    </preferences>

    <preferences profiles="s390-kvm">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
        <rpm-excludedocs>true</rpm-excludedocs>
        <locale>en_US</locale>
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
+
        <type
            image="oem"
            filesystem="btrfs"
            bootpartition="true"
            bootpartsize="300"
-            bootfilesystem="ext4"
+            bootfilesystem="ext2"
        initrd_system="dracut"
        format="qcow2"
-            kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 ignition.platform.id=metal"
+            kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet"
        devicepersistency="by-uuid"
            btrfs_root_is_snapshot="true"
            btrfs_root_is_readonly_snapshot="true"
@@ -506,7 +429,7 @@


    <preferences profiles="s390-dasd">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -517,9 +440,9 @@
          filesystem="btrfs"
          bootpartition="true"
          bootpartsize="300"
-          bootfilesystem="ext4"
+          bootfilesystem="ext2"
          initrd_system="dracut"
-          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1"
+          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet"
          devicepersistency="by-uuid"
          target_blocksize="4096"
          btrfs_root_is_snapshot="true"
@@ -544,7 +467,7 @@


    <preferences profiles="s390-fba">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -555,9 +478,9 @@
          filesystem="btrfs"
          bootpartition="true"
          bootpartsize="300"
-          bootfilesystem="ext4"
+          bootfilesystem="ext2"
          initrd_system="dracut"
-          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1"
+          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet"
          devicepersistency="by-uuid"
          btrfs_root_is_snapshot="true"
          btrfs_root_is_readonly_snapshot="true"
@@ -578,47 +501,9 @@
        </type>
    </preferences>

-    <preferences profiles="s390-fcp">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <type
-          image="oem"
-          filesystem="btrfs"
-          installpxe="true"
-          bootpartition="true"
-          bootpartsize="300"
-          bootfilesystem="ext4"
-          initrd_system="dracut"
-          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1"
-          devicepersistency="by-uuid"
-          btrfs_root_is_snapshot="true"
-          btrfs_root_is_readonly_snapshot="true"
-          btrfs_quota_groups="true"
-        >
-            <oemconfig>
-                <oem-multipath-scan>true</oem-multipath-scan>
-            </oemconfig>
-            <bootloader name="grub2_s390x_emu" console="serial" timeout="3" targettype="SCSI"/>
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/s390x-emu" mountpoint="boot/grub2/s390x-emu"/>
-                <volume name="boot/writable"/>
-                <volume name="usr/local"/>
-                <volume name="var" copy_on_write="false"/>
-            </systemdisk>
-            <size unit="G">5</size>
-        </type>
-    </preferences>

    <preferences profiles="x86-vmware">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -653,7 +538,7 @@
        </type>
    </preferences>
    <preferences profiles="x86-qcow">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -664,7 +549,7 @@
            format="qcow2"
            filesystem="btrfs"
            firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=qemu"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=qemu"
            bootpartition="false"
            bootkernel="custom"
            devicepersistency="by-uuid"
@@ -692,7 +577,7 @@
    </preferences>

    <preferences profiles="aarch64-qcow">
-        <version>6.1</version>
+        <version>6.0</version>
        <packagemanager>zypper</packagemanager>
        <bootsplash-theme>SLE</bootsplash-theme>
        <bootloader-theme>SLE</bootloader-theme>
@@ -704,7 +589,7 @@
            filesystem="btrfs"
            firmware="uefi"
            efipartsize="128"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=qemu"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=qemu"
            bootpartition="false"
            bootkernel="custom"
            devicepersistency="by-uuid"
@@ -715,7 +600,7 @@
            <systemdisk>
                <volume name="home"/>
                <volume name="root"/>
-                <volume name="opt"/>
+ 		<volume name="opt"/>
                <volume name="srv"/>
                <volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
                <volume name="boot/writable"/>
@@ -726,161 +611,6 @@
        </type>
    </preferences>

-    <preferences profiles="ppc64le-512ss">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-    <preferences profiles="ppc64le-4096ss">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- TODO: supposedly this is needed as type attribute, but kiwi needs patching
-             disk_start_sector="256" -->
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            target_blocksize="4096"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-
-    <preferences profiles="ppc64le-512ss-self_install">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            installiso="true"
-            installpxe="true"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <installmedia>
-                <initrd action="omit">
-                    <dracut module="drm"/>
-                </initrd>
-            </installmedia>
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-    <preferences profiles="ppc64le-4096ss-self_install">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- TODO: supposedly this is needed as type attribute, but kiwi needs patching
-             disk_start_sector="256" -->
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            installiso="true"
-            installpxe="true"
-            target_blocksize="4096"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <installmedia>
-                <initrd action="omit">
-                    <dracut module="drm"/>
-                </initrd>
-            </installmedia>
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-
-
   <repository type="rpm-md" >
        <source path='obsrepositories:/'/>
    </repository>
@@ -925,6 +655,8 @@
        <package name="patterns-base-transactional"/>
        <namedCollection name="container_runtime_podman"/>
        <package name="patterns-container-runtime_podman"/>
+        <namedCollection name="cockpit"/>
+        <package name="patterns-base-cockpit"/>
        <namedCollection name="selinux"/>
        <package name="patterns-base-selinux"/>
        <package name="suseconnect-ng"/>
@@ -988,8 +720,7 @@
        <package name="grub2-x86_64-efi" arch="x86_64"/>
        <package name="grub2-arm64-efi" arch="aarch64"/>
        <package name="grub2-s390x-emu" arch="s390x"/>
-        <package name="grub2-powerpc-ieee1275" arch="ppc64le"/>
-        <package name="grub2-branding-SLE" bootinclude="true" arch="x86_64,aarch64,ppc64le"/>
+        <package name="grub2-branding-SLE" bootinclude="true" arch="x86_64,aarch64"/>
        <package name="grub2-snapper-plugin"/>
        <package name="shim" arch="x86_64,aarch64"/>
 	<package name="mokutil" arch="x86_64,aarch64"/>
@@ -997,44 +728,46 @@
 	    <package name="kpartx" arch="s390x"/>--> <!-- previous releases picked it always, now kiwi picks partx instead -->
    </packages>
    <!-- rpi kernel-default-base does not provide all necessary drivers -->
-    <packages type="image" profiles="rpi,aarch64-self_install,x86,x86-encrypted,x86-legacy,x86-self_install,x86-vmware,x86-qcow,aarch64-qcow,s390-kvm,s390-dasd,s390-fba,s390-fcp,ppc64le-512ss,ppc64le-4096ss,ppc64le-512ss-self_install,ppc64le-4096ss-self_install">
+    <packages type="image" profiles="x86,x86-encrypted,x86-legacy,x86-self_install,x86-vmware,x86-qcow,aarch64-qcow,s390-kvm,s390-dasd,s390-fba">
        <package name="kernel-default"/>
        <package name="kernel-firmware-all"/>
    </packages>
-    <packages type="image" profiles="x86-rt,x86-rt-self_install,x86-rt-encrypted,aarch64-rt,aarch64-rt-self_install">
+    <packages type="image" profiles="x86-rt,x86-rt-self_install,x86-rt-encrypted">
        <package name="kernel-rt"/>
-        <package name="kernel-firmware-all"/>
+	<package name="kernel-firmware-all"/>
 	<!-- FIXME intentionally removed from ALP code stream
-        <package name="cpuset"/> -->
+	<package name="cpuset"/> -->
    </packages>
-    <packages type="image" profiles="s390-kvm,s390-dasd,s390-fba,s390-fcp">
-        <package name="dracut-kiwi-oem-dump"/>
+    <!-- makes the image build, but also include kernel-default
+    <packages type="image" profiles="x86-rt-encrypted">
+        <package name="kernel-default-extra"/>
+    </packages> -->
+    <packages type="image" profiles="s390-kvm,s390-dasd,s390-fba">
        <package name="dracut-kiwi-oem-repart"/>
        <package name="blog"/>
    </packages>
-    <!-- FCP is usually used multipathed. -->
-    <packages type="image" profiles="s390-fcp">
-        <package name="multipath-tools"/>
-    </packages>
-    <packages type="image" profiles="x86,x86-encrypted,x86-rt-encrypted,x86-self_install,x86-legacy,x86-vmware,x86-rt,x86-rt-self_install,x86-qcow,aarch64-qcow,rpi,aarch64-self_install,aarch64-rt,aarch64-rt-self_install,ppc64le-512ss,ppc64le-4096ss,ppc64le-512ss-self_install,ppc64le-4096ss-self_install">
+    <packages type="image" profiles="x86,x86-encrypted,x86-rt-encrypted,x86-self_install,x86-legacy,x86-vmware,x86-rt,x86-rt-self_install,x86-qcow,aarch64-qcow,rpi,aarch64-self_install">
        <package name="dracut-kiwi-oem-repart"/>
        <package name="dracut-kiwi-oem-dump"/>
    </packages>
-    <packages type="image" profiles="rpi,aarch64-self_install,aarch64-rt,aarch64-rt-self_install">
+    <packages type="image" profiles="rpi,aarch64-self_install">
        <package name="raspberrypi-firmware" arch="aarch64"/>
        <package name="raspberrypi-firmware-config" arch="aarch64"/>
        <package name="raspberrypi-firmware-dt" arch="aarch64"/>
        <package name="u-boot-rpiarm64" arch="aarch64"/>
        <package name="dracut-kiwi-oem-repart"/>
        <package name="bcm43xx-firmware"/>
+        <package name="kernel-firmware-all"/><!-- Fix choice between kernel-firmware and kernel-firmware-all -->
        <package name="wireless-regdb"/>
        <package name="wireless-tools"/>
        <package name="wpa_supplicant"/>
        <package name="grub2-arm64-efi"/>
+        <!-- kernel-default-base does not have all required drivers -->
+        <package name="kernel-default"/>
    </packages>
    <packages type="bootstrap">
-        <package name="filesystem"/>
        <package name="coreutils"/>
+        <package name="filesystem"/>
        <package name="ca-certificates"/>
        <package name="ca-certificates-mozilla"/>
    </packages>
@@ -1048,14 +781,4 @@
    <packages type="image" profiles="x86-qcow,aarch64-qcow">
        <package name="qemu-guest-agent"/>
    </packages>
-
-    <!-- jsc#PED-8599 -->
-    <packages type="image" profiles="Base,Base-encrypted,Base-RT,Base-RT-encrypted,Base-fba,Base-dasd,Base-fcp,Base-512,Base-4096,Default,Default-encrypted,Default-fba,Default-dasd,Default-fcp,Default-512,Default-4096">
-        <package name="usbguard"/>
-    </packages>
-
-    <!-- jsc#PED-8788 -->
-    <packages type="image" profiles="Base-RT,Base-RT-encrypted,x86-rt-encrypted,x86-rt,x86-rt-self_install,aarch64-rt,aarch64-rt-self_install">
-        <package name="stalld"/>
-    </packages>
-</image>
+</image>
--- a/kiwi-builder-image/build-image.sh
+++ b/kiwi-builder-image/build-image.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -27,9 +27,9 @@ LARGEBLOCK=false
 # Print usage
 usage(){
  cat <<-EOF
-  =====================================
-  SUSE Linux Micro 6.1 Kiwi SDK Builder
-  =====================================
+  ==============================
+  SLE Micro 6.0 Kiwi SDK Builder
+  ==============================

  Usage: ${0} [-p <profile>] [-b]

--- a/kiwi-builder-image/config.sh
+++ b/kiwi-builder-image/config.sh
@@ -35,6 +35,14 @@ mkdir /var/lib/misc/reconfig_system
 #--------------------------------------
 echo "Configure image: [$kiwi_iname]-[$kiwi_profiles]..."

+#======================================
+# This is a workaround - someone,
+# somewhere needs to load the xts crypto
+# module, otherwise luksOpen will fail while
+# creating the image.
+#--------------------------------------
+modprobe xts || true
+
 #======================================
 # add missing fonts
 #--------------------------------------
@@ -131,6 +139,9 @@ for i in /usr/lib/rpm/gnupg/keys/gpg-pubkey*asc; do
    rpm --import $i || true
 done

+# Temporary workaround for bsc#1212187
+echo "techpreview.ZYPP_MEDIANETWORK=1" >> /etc/zypp/zypp.conf
+
 #======================================
 # Enable kubelet if installed
 #--------------------------------------
@@ -159,18 +170,8 @@ if [ "${kiwi_btrfs_root_is_snapshot-false}" = 'true' ]; then
 	sed -i'' 's/^NUMBER_LIMIT_IMPORTANT=.*$/NUMBER_LIMIT_IMPORTANT="4-10"/g' /etc/snapper/configs/root
 fi

-# Enable multipathd for MP images
-if [ "${kiwi_oemmultipath_scan-false}" = 'true' ]; then
-        systemctl enable multipathd.service
-fi
-
-# On those s390 targets the console is not capable of running jeos-firstboot,
-# use systemd-firstboot as minimal alternative.
-if [[ "$kiwi_profiles" =~ s390-(dasd|fba|fcp) ]]; then
-	systemctl enable systemd-firstboot
-	# Enable prompting for the root password
-	echo 'root:!unprovisioned' | chpasswd -e
-elif rpm -q --whatprovides jeos-firstboot >/dev/null; then
+# Enable jeos-firstboot if installed, disabled by combustion/ignition
+if rpm -q --whatprovides jeos-firstboot >/dev/null; then
        mkdir -p /var/lib/YaST2
        touch /var/lib/YaST2/reconfig_system
        systemctl enable jeos-firstboot.service
@@ -280,7 +281,7 @@ if [[ "$kiwi_profiles" == *"RaspberryPi"* ]]; then
 		options smsc95xx turbo_mode=N
 	EOF

-	cat > /etc/sysctl.d/50-rpi3.conf <<-EOF
+	cat > /usr/lib/sysctl.d/50-rpi3.conf <<-EOF
 		# Avoid running out of DMA pages for smsc95xx (bsc#1012449)
 		vm.min_free_kbytes = 2048
 	EOF
--- a/metal3-chart/Chart.yaml
+++ b/metal3-chart/Chart.yaml
@@ -1,7 +1,7 @@
-#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.2
-#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.2-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.4
+#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.4-%RELEASE%
 apiVersion: v2
-appVersion: 0.9.2
+appVersion: 0.9.4
 dependencies:
 - alias: metal3-baremetal-operator
  name: baremetal-operator
@@ -10,7 +10,7 @@ dependencies:
 - alias: metal3-ironic
  name: ironic
  repository: file://./charts/ironic
-  version: 0.9.1
+  version: 0.9.3
 - alias: metal3-mariadb
  condition: global.enable_mariadb
  name: mariadb
@@ -25,4 +25,4 @@ description: A Helm chart that installs all of the dependencies needed for Metal
 icon: https://github.com/cncf/artwork/raw/master/projects/metal3/icon/color/metal3-icon-color.svg
 name: metal3
 type: application
-version: "%%CHART_MAJOR%%.0.0+up0.9.2"
+version: "%%CHART_MAJOR%%.0.0+up0.9.4"
--- a/metal3-chart/charts/ironic/Chart.yaml
+++ b/metal3-chart/charts/ironic/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: 26.1.2
 description: A Helm chart for Ironic, used by Metal3
 name: ironic
 type: application
-version: 0.9.1
+version: 0.9.3
--- a/metal3-chart/charts/ironic/templates/deployment.yaml
+++ b/metal3-chart/charts/ironic/templates/deployment.yaml
@@ -77,9 +77,6 @@ spec:
            mountPath: "/certs/vmedia"
            readOnly: true
          {{- end }}
-          - mountPath: /shared/html/tstcerts
-            name: cert-ironic-ca
-            readOnly: true
        {{- end }}
      - name: ironic-log-watch
        image: {{ .Values.images.ironic.repository }}:{{ .Values.images.ironic.tag }}
--- a/metal3-chart/charts/ironic/values.yaml
+++ b/metal3-chart/charts/ironic/values.yaml
@@ -56,7 +56,7 @@ images:
  ironic:
    repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic
    pullPolicy: IfNotPresent
-    tag: 26.1.2.2
+    tag: 26.1.2.3
  ironicIPADownloader:
    repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic-ipa-downloader
    pullPolicy: IfNotPresent
--- a/release-manifest-image/release_manifest.yaml
+++ b/release-manifest-image/release_manifest.yaml
@@ -96,12 +96,12 @@ spec:
        - prettyName: Longhorn
          releaseName: longhorn
          chart: longhorn
-          version: 105.1.0+up1.7.2
+          version: 105.1.1+up1.7.3
          repository: https://charts.rancher.io
          dependencyCharts:
            - releaseName: longhorn-crd
              chart: longhorn-crd
-              version: 105.1.0+up1.7.2
+              version: 105.1.1+up1.7.3
              repository: https://charts.rancher.io
        - prettyName: MetalLB
          releaseName: metallb
@@ -170,7 +170,7 @@ spec:
        - prettyName: Metal3
          releaseName: metal3
          chart: %%CHART_REPO%%/%%IMG_PREFIX%%metal3-chart
-          version: %%CHART_MAJOR%%.0.0+up0.9.0
+          version: %%CHART_MAJOR%%.0.0+up0.9.4
        - prettyName: RancherTurtles
          releaseName: rancher-turtles
          chart: %%CHART_REPO%%/%%IMG_PREFIX%%rancher-turtles-chart
Author	SHA256	Message	Date
Denislav Prodanov	50d3ae722f	Revert "create 3.2.1 release manifest" This reverts commit `189db31b7f`.	2025-03-20 11:43:48 +02:00
Denislav Prodanov	189db31b7f	create 3.2.1 release manifest	2025-03-20 11:20:53 +02:00
Denislav Prodanov	af930ae49c	Merge pull request '[3.2] update longhorn version to 1.7.3' (#90 ) from dprodanov/Factory:backport-3.2-main into 3.2 Reviewed-on: suse-edge/Factory#90 Reviewed-by: Steven Hardy <steven.hardy@noreply.src.opensuse.org>	2025-03-14 13:08:29 +01:00
Denislav Prodanov	625b0da057	update longhorn version to 1.7.3 remove accidental push of .idea	2025-03-14 12:25:54 +02:00
Steven Hardy	17b108ef3d	release-manifest: Update metal3 version Aligns with latest 0.9.4 version on this branch	2025-03-13 12:04:28 +00:00
Steven Hardy	d0e1e065a5	metal3-chart: update to 0.9.4 Aligns with https://github.com/suse-edge/charts/pull/192 (cherry picked from commit `6531575f1b`)	2025-03-13 12:00:39 +00:00
Steven Hardy	1d9ae4aa3d	metal3-chart: update to 0.9.3 Aligns with https://github.com/suse-edge/charts/pull/189 (cherry picked from commit `d59f3540a2`)	2025-03-13 11:59:56 +00:00
Steven Hardy	2553da6659	ironic-image: update to 26.1.2.3 Aligns with https://github.com/suse-edge/charts/pull/189 Also see: https://build.opensuse.org/package/rdiff/isv:SUSE:Edge:Metal3:Ironic:2024.2/ironic-image?linkrev=base&rev=11 (cherry picked from commit `43c764e69c`)	2025-03-13 11:59:33 +00:00
Nicolas Belouin	3d6c9be9ed	Merge pull request '[3.2] Backport workflows for prjconf and meta and fixes for tar_scm' (#78 ) from nbelouin/Factory:backport-workflows into 3.2 Reviewed-on: suse-edge/Factory#78 Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org> Reviewed-by: Steven Hardy <steven.hardy@noreply.src.opensuse.org>	2025-02-25 15:34:57 +01:00
Steven Hardy	e6561f36ed	Add metal3 images to ARM allowlist We need to ensure these build to enable usage of the metal3 chart on ARM (cherry picked from commit `f61bb1e0e6`) Add ipcalc, crudini and fakeroot for aarch64 build Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com> (cherry picked from commit `98c4be017d`)	2025-02-24 16:01:03 +01:00
Nicolas Belouin	fa1da01c29	Fix obsinfo tar issues Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com> (cherry picked from commit `dccf206a98`) (cherry picked from commit `7f93226cd3`)	2025-02-24 16:00:50 +01:00
Nicolas Belouin	cf3153e074	Sync metadata, revamp PR jobs Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com> (cherry picked from commit `d6d501ad99`) (cherry picked from commit `4d824b71cc`) (cherry picked from commit `0d3c83fca1`) (cherry picked from commit `5a73d61002`) (cherry picked from commit `34687fb5e9`) (cherry picked from commit `4a99805fde`) (cherry picked from commit `331f08255c`) (cherry picked from commit `3dea69443d`) (cherry picked from commit `d97e434fce`) (cherry picked from commit `9e41ee25d9`) (cherry picked from commit `8f20b3433e`)	2025-02-24 16:00:18 +01:00
Nicolas Belouin	94d4faf0f9	Add project config to git Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com> (cherry picked from commit `c86d724e92`) (cherry picked from commit `c04b2af72b`) (cherry picked from commit `54e0941879`) (cherry picked from commit `a510134ed4`)	2025-02-24 15:59:45 +01:00
Steven Hardy	943fe7cda4	metal3-chart: Update to 0.9.2 Align with https://github.com/suse-edge/charts/pull/182 (cherry picked from commit `9d97e8a56d`)	2025-02-13 14:26:56 +00:00
Steven Hardy	10757d70e3	ironic-image: update to 26.1.2.2 Align with: https://build.opensuse.org/package/rdiff/isv:SUSE:Edge:Metal3:Ironic:2024.2/ironic-image?linkrev=base&rev=10 https://github.com/suse-edge/charts/pull/182 Fixes a pod restart caused by the runlogwatch.sh script (cherry picked from commit `b912f9d68a`)	2025-02-13 14:26:37 +00:00
Steven Hardy	74a858e8dc	ironic-ipa-downloader-image: remove unused _service entry This is hard-coded to x86_64 so won't work for ARM, aligns with: https://build.opensuse.org/package/rdiff/isv:SUSE:Edge:Metal3:Ironic:2024.2/ironic-ipa-downloader-image?linkrev=base&rev=6 (cherry picked from commit `45443d5b5f`)	2025-02-13 14:26:22 +00:00
Steven Hardy	09f0242287	metal3-chart: update to 0.9.1 Align with https://github.com/suse-edge/charts/pull/173 which added some fixes to enable deployment on aarch64 (cherry picked from commit `5d20bc38e3`)	2025-02-13 14:25:51 +00:00
Steven Hardy	51ea0c0499	ironic-ipa-downloader-image: update to 3.0.1 Update to the latest version from https://build.opensuse.org/package/show/isv:SUSE:Edge:Metal3:Ironic:2024.2/ironic-ipa-downloader-image (cherry picked from commit `e085a97d98`)	2025-02-13 14:25:37 +00:00
Steven Hardy	e4363afaf9	Add ironic-ipa-ramdisk/root.tar.bz2 to lfs	2025-02-13 14:25:21 +00:00
Steven Hardy	4b20cf74d9	ironic-ipa-ramdisk: update to 3.0.1 Update to the latest version from https://build.opensuse.org/package/show/isv:SUSE:Edge:Metal3:Ironic:2024.2/ironic-ipa-ramdisk (cherry picked from commit `58c8be887a`)	2025-02-13 14:24:34 +00:00
Steven Hardy	2b4c6c3cce	ironic-image: update to 26.1.2.1 Align with latest 26.1.2.1 version from https://build.opensuse.org/package/show/isv:SUSE:Edge:Metal3:Ironic:2024.2/ironic-image (cherry picked from commit `0d59ad920e`)	2025-02-13 14:24:12 +00:00
Nicolas Belouin	a223185628	Merge pull request 'Import missing package: frr-k8s-image' (#68 ) from nbelouin/Factory:import-frr-k8s-image-3.2 into 3.2 Reviewed-on: suse-edge/Factory#68 Reviewed-by: Atanas Dinov <atanasdinov@noreply.src.opensuse.org> Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2025-01-17 10:18:39 +01:00
Nicolas Belouin	79dff5fce2	Add package to workflow Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>	2025-01-17 10:18:03 +01:00
Nicolas Belouin	f7a87ceaf0	Import missing package: frr-k8s-image Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com> (cherry picked from commit `5490ffcde2`) Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>	2025-01-17 10:16:00 +01:00
Nicolas Belouin	71e3e0b40a	Merge pull request '[3.2] Add an additional tag without the _up suffix to please Rancher for dashboard extensions' (#66 ) from nbelouin/Factory:add-no-up-tag-extensions-3.2 into 3.2 Reviewed-on: suse-edge/Factory#66 Reviewed-by: Atanas Dinov <atanasdinov@noreply.src.opensuse.org>	2025-01-16 15:54:54 +01:00
Nicolas Belouin	4da1ed42d2	Add an additional tag without the _up suffix to please Rancher for dashboard extensions Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>	2025-01-16 15:47:55 +01:00
Nicolas Belouin	2ba0efdb93	Merge pull request '[3.2] Use manifest_repo var to allow for release manifest in separate repo' (#64 ) from nbelouin/Factory:backport-manifest-repo into 3.2 Reviewed-on: suse-edge/Factory#64 Reviewed-by: Ivo Petrov <ipetrov117@noreply.src.opensuse.org> Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2025-01-10 15:15:31 +01:00
Nicolas Belouin	f0ec2699b4	Use manifest_repo var to allow for release manifest in separate repo Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com> (cherry picked from commit `2a993e342e`)	2024-12-23 14:15:00 +01:00
Nicolas Belouin	1390d88af7	IPA ramdisk git LFS fix Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>	2024-12-23 11:38:00 +01:00
Steven Hardy	9dfaedadf9	release-manifest: Update to Rancher prime 2.10.1 2.10.1 was released so update to the prime version (cherry picked from commit `cab6fe1bcb`)	2024-12-20 09:40:33 +00:00
Ivo Petrov	81c1b981c2	Backport Release Manifest changes (#61 ) Backports [#60](suse-edge/Factory#60) to 3.2. Reviewed-on: suse-edge/Factory#61 Reviewed-by: Atanas Dinov <atanasdinov@noreply.src.opensuse.org> Co-authored-by: Ivo Petrov <ivo.petrov@suse.com> Co-committed-by: Ivo Petrov <ivo.petrov@suse.com>	2024-12-19 12:54:57 +01:00
Ivo Petrov	b71760b245	Backport K8s 1.31.3 release manifest version bump (#59 ) Backports [#58](suse-edge/Factory#58). Reviewed-on: suse-edge/Factory#59 Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org> Reviewed-by: Atanas Dinov <atanasdinov@noreply.src.opensuse.org> Co-authored-by: Ivo Petrov <ivo.petrov@suse.com> Co-committed-by: Ivo Petrov <ivo.petrov@suse.com>	2024-12-17 09:39:02 +01:00
Ivo Petrov	f5e4126dad	Backport elemental dashboard release manifest change to 3.2 (#56 ) Backport: Add missing Elemental dashboard chart ([#55](suse-edge/Factory#55)) Reviewed-on: suse-edge/Factory#56 Reviewed-by: Atanas Dinov <atanasdinov@noreply.src.opensuse.org> Co-authored-by: Ivo Petrov <ivo.petrov@suse.com> Co-committed-by: Ivo Petrov <ivo.petrov@suse.com>	2024-12-12 11:37:53 +01:00
Atanas Dinov	26e34cc386	[3.2] Bump Upgrade Controller and Release Manifest (#54 ) Co-authored-by: Ivo Petrov <ivo.petrov@suse.com> Reviewed-on: suse-edge/Factory#54 Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2024-12-12 09:39:30 +01:00
Jiří Tomášek	af59834eaf	Merge pull request '[3.2] Update kubevirt-dashboard-extension-chart to v1.2.1' (#50 ) from jtomasek/Factory:kubevirt-extension-3.2-bkprt into 3.2 Reviewed-on: suse-edge/Factory#50 Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2024-12-06 11:03:10 +01:00
Jiří Tomášek	5ff222b69b	Merge pull request '[3.2] Update akri-dashboard-extension-chart to v1.2.1' (#51 ) from jtomasek/Factory:akri-extension-3.2-bkprt into 3.2 Reviewed-on: suse-edge/Factory#51 Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2024-12-06 11:03:01 +01:00
Denislav Prodanov	14b56eabbe	Merge pull request '[3.2] Backport rancher-turtles updates' (#47 ) from steven.hardy/Factory:turtles_3.2 into 3.2 Reviewed-on: suse-edge/Factory#47 Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2024-12-06 10:57:08 +01:00
Jiri Tomasek	d91b28fb5b	Update akri-dashboard-extension-chart to v1.2.1 (cherry picked from commit `87c7e1be88`)	2024-12-06 09:54:10 +01:00
Jiri Tomasek	4aa46388cf	Update kubevirt-dashboard-extension-chart to v1.2.1 (cherry picked from commit `568d5d1590`)	2024-12-06 09:52:36 +01:00
Steven Hardy	dfa68ba86e	release-manifest: Update rancher-turtles chart Fix the rancher-turtles-chart version to align with #44 (cherry picked from commit `fbd596290a`)	2024-12-05 17:46:29 +00:00
Steven Hardy	075e2a209c	Remove CAPM3/IPAM images These are now provided by the rancher registry since #44 Conflicts: .obs/workflows.yml (cherry picked from commit `ec6c4745ea`)	2024-12-05 17:45:54 +00:00
Steven Hardy	2928b2076e	rancher-turtles-airgap-resources-chart: Update to 0.14.1 upstream release Aligns with https://github.com/suse-edge/charts/pull/174 which rebases to 0.14.1, which is marked as compatible with Rancher 2.10 (cherry picked from commit `856ec2ac8e`)	2024-12-05 17:43:56 +00:00
Steven Hardy	39338dd6ac	rancher-turtles-chart: Update to 0.14.1 upstream release Aligns with https://github.com/suse-edge/charts/pull/174 which rebases to 0.14.1, which is marked as compatible with Rancher 2.10 (cherry picked from commit `7721c66ab0`)	2024-12-05 17:43:43 +00:00
Denislav Prodanov	dfc8bb30d9	Merge pull request 'backport into 3.2 fixed versions in eib artifacts' (#43 ) from dprodanov/Factory:eib-3.2 into 3.2 Reviewed-on: suse-edge/Factory#43 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org>	2024-12-04 16:16:35 +01:00
Denislav Prodanov	33f56e8b23	fixed versions in eib artifacts	2024-12-04 17:12:03 +02:00
Steven Hardy	744d04b40a	kiwi-builder-image: Align with OBS latest version Aligns with the latest fixes in isv:SUSE:Edge:KiwiBuilder/kiwi-builder-10 (cherry picked from commit `8a93aae7c5`)	2024-12-04 12:25:44 +00:00
Denislav Prodanov	5e098df843	Merge pull request 'updated longhorn and neuvector to latest 105 charts' (#39 ) from dprodanov/Factory:upstream-3.2 into 3.2 Reviewed-on: suse-edge/Factory#39 Reviewed-by: Ivo Petrov <ipetrov117@noreply.src.opensuse.org>	2024-11-28 16:23:41 +01:00
Denislav Prodanov	7555048917	updated longhorn and neuvector to latest 105 charts	2024-11-28 17:16:25 +02:00
Denislav Prodanov	e92a50d110	Merge pull request '[3.2 backport] rancher-turtles: Fix issue in 0.4.0 chart' (#37 ) from steven.hardy/Factory:turtles_fix_3.2 into 3.2 Reviewed-on: suse-edge/Factory#37 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org> Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2024-11-27 14:08:45 +01:00
Steven Hardy	da2ad77951	rancher-turtles: Fix issue in 0.4.0 chart The previous import was based on a pre-merge copy of the following PR - an issue was discovered during SV validation which required an additional change to ensure CRDs are created before creating the ClusterctlConfig CR https://github.com/suse-edge/charts/pull/166 (cherry picked from commit `636493adba`)	2024-11-27 11:16:59 +00:00
Denislav Prodanov	be4fae4b18	3.2 branching	2024-11-25 15:59:33 +02:00