Merge pull request #20 from davidcassany/update_to_SL_Micro_channels

Move to SL Micro 6.0 channels
rancher · Aug 5, 2024 · 8209be0 · 8209be0
2 parents 684621e + 8553da3
commit 8209be0
Show file tree

Hide file tree

Showing 10 changed files with 116 additions and 351 deletions.
diff --git a/.obs/dockerfile/Dockerfile.sle-micro-5-5-kvm → ...ckerfile/Dockerfile.sl-micro-60-baremetal b/.obs/dockerfile/Dockerfile.sle-micro-5-5-kvm → ...ckerfile/Dockerfile.sl-micro-60-baremetal
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: rancher/elemental-channel/sle-micro:5.5-kvm
-#!BuildTag: rancher/elemental-channel/sle-micro:5.5-kvm-%RELEASE%
+#!BuildTag: rancher/elemental-channel/sl-micro:6.0-baremetal
+#!BuildTag: rancher/elemental-channel/sl-micro:6.0-baremetal-%RELEASE%
 #!UseOBSRepositories
 
 ARG SLMICRO_VERSION
@@ -11,7 +11,7 @@ FROM suse/sl-micro/${SLMICRO_VERSION}/toolbox:latest as toolbox
 RUN mkdir -p /busybox && rpm --initdb --root /busybox
 RUN zypper --installroot /busybox in --no-recommends -y busybox
 
-ARG CHANNEL_JSON_FILE="sle-micro-5-5-kvm.json"
+ARG CHANNEL_JSON_FILE="sl-micro-60-baremetal.json"
 
 COPY $CHANNEL_JSON_FILE /channel.json
 
@@ -24,13 +24,13 @@ USER 10010:10010
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.rancher.elemental
-LABEL org.opencontainers.image.title="Rancher SLE Micro 5.5 KVM Channel"
+LABEL org.opencontainers.image.title="SL Micro 6.0 Baremetal Channel"
 LABEL org.opencontainers.image.description="Includes the Elemental Channel"
-LABEL org.opencontainers.image.version="5.5-kvm"
+LABEL org.opencontainers.image.version="6.0-baremetal"
 LABEL org.opencontainers.image.url="https://build.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opensuse.reference="rancher/elemental-channel/sle-micro:5.5-kvm"
+LABEL org.opensuse.reference="rancher/elemental-channel/sl-micro:6.0-baremetal"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 # endlabelprefix
 

diff --git a/.obs/dockerfile/Dockerfile.sle-micro-5-5-rt → .obs/dockerfile/Dockerfile.sl-micro-60-base b/.obs/dockerfile/Dockerfile.sle-micro-5-5-rt → .obs/dockerfile/Dockerfile.sl-micro-60-base
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: rancher/elemental-channel/sle-micro:5.5-rt
-#!BuildTag: rancher/elemental-channel/sle-micro:5.5-rt-%RELEASE%
+#!BuildTag: rancher/elemental-channel/sl-micro:6.0-base
+#!BuildTag: rancher/elemental-channel/sl-micro:6.0-base-%RELEASE%
 #!UseOBSRepositories
 
 ARG SLMICRO_VERSION
@@ -11,7 +11,7 @@ FROM suse/sl-micro/${SLMICRO_VERSION}/toolbox:latest as toolbox
 RUN mkdir -p /busybox && rpm --initdb --root /busybox
 RUN zypper --installroot /busybox in --no-recommends -y busybox
 
-ARG CHANNEL_JSON_FILE="sle-micro-5-5-rt.json"
+ARG CHANNEL_JSON_FILE="sl-micro-60-base.json"
 
 COPY $CHANNEL_JSON_FILE /channel.json
 
@@ -24,13 +24,13 @@ USER 10010:10010
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.rancher.elemental
-LABEL org.opencontainers.image.title="Rancher SLE Micro 5.5 RT Channel"
+LABEL org.opencontainers.image.title="SL Micro 6.0 Base Channel"
 LABEL org.opencontainers.image.description="Includes the Elemental Channel"
-LABEL org.opencontainers.image.version="5.5-rt"
+LABEL org.opencontainers.image.version="6.0-base"
 LABEL org.opencontainers.image.url="https://build.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opensuse.reference="rancher/elemental-channel/sle-micro:5.5-rt"
+LABEL org.opensuse.reference="rancher/elemental-channel/sl-micro:6.0-base"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 # endlabelprefix
 

diff --git a/.obs/dockerfile/Dockerfile.sle-micro-5-5 → .obs/dockerfile/Dockerfile.sl-micro-60-kvm b/.obs/dockerfile/Dockerfile.sle-micro-5-5 → .obs/dockerfile/Dockerfile.sl-micro-60-kvm
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: rancher/elemental-channel/sle-micro:5.5
-#!BuildTag: rancher/elemental-channel/sle-micro:5.5-%RELEASE%
+#!BuildTag: rancher/elemental-channel/sl-micro:6.0-kvm
+#!BuildTag: rancher/elemental-channel/sl-micro:6.0-kvm-%RELEASE%
 #!UseOBSRepositories
 
 ARG SLMICRO_VERSION
@@ -11,7 +11,7 @@ FROM suse/sl-micro/${SLMICRO_VERSION}/toolbox:latest as toolbox
 RUN mkdir -p /busybox && rpm --initdb --root /busybox
 RUN zypper --installroot /busybox in --no-recommends -y busybox
 
-ARG CHANNEL_JSON_FILE="sle-micro-5-5.json"
+ARG CHANNEL_JSON_FILE="sl-micro-60-kvm.json"
 
 COPY $CHANNEL_JSON_FILE /channel.json
 
@@ -24,13 +24,13 @@ USER 10010:10010
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.rancher.elemental
-LABEL org.opencontainers.image.title="Rancher SLE Micro 5.5 Channel"
+LABEL org.opencontainers.image.title="SL Micro 6.0 KVM Channel"
 LABEL org.opencontainers.image.description="Includes the Elemental Channel"
-LABEL org.opencontainers.image.version="5.5"
+LABEL org.opencontainers.image.version="6.0-kvm"
 LABEL org.opencontainers.image.url="https://build.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opensuse.reference="rancher/elemental-channel/sle-micro:5.5"
+LABEL org.opensuse.reference="rancher/elemental-channel/sl-micro:6.0-kvm"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 # endlabelprefix
 

diff --git a/channels/sl-micro-60-baremetal.json b/channels/sl-micro-60-baremetal.json
@@ -0,0 +1,28 @@
+[
+    {
+        "metadata": {
+            "name": "baremetal-v2.1.1-3.29-os"
+        },
+        "spec": {
+            "version": "v2.1.1-3.29",
+            "type": "container",
+            "metadata": {
+                "upgradeImage": "registry.suse.com/suse/sl-micro/6.0/baremetal-os-container:2.1.1-3.29",
+                "displayName": "SL Micro 6.0 OS"
+            }
+        }
+    },
+    {
+        "metadata": {
+            "name": "baremetal-v2.1.1-3.36-iso"
+        },
+        "spec": {
+            "version": "v2.1.1-3.36",
+            "type": "iso",
+            "metadata": {
+                "uri": "registry.suse.com/suse/sl-micro/6.0/baremetal-iso-image:2.1.1-3.36",
+                "displayName": "SL Micro 6.0 ISO"
+            }
+        }
+    }
+]
diff --git a/channels/sl-micro-60-base.json b/channels/sl-micro-60-base.json
@@ -0,0 +1,28 @@
+[
+    {
+        "metadata": {
+            "name": "base-v2.1.1-3.18-os"
+        },
+        "spec": {
+            "version": "v2.1.1-3.18",
+            "type": "container",
+            "metadata": {
+                "upgradeImage": "registry.suse.com/suse/sl-micro/6.0/base-os-container:2.1.1-3.18",
+                "displayName": "SL Micro Base 6.0 OS"
+            }
+        }
+    },
+    {
+        "metadata": {
+            "name": "base-v2.1.1-2.47-iso"
+        },
+        "spec": {
+            "version": "v2.1.1-2.47",
+            "type": "iso",
+            "metadata": {
+                "uri": "registry.suse.com/suse/sl-micro/6.0/base-iso-image:2.1.1-2.47",
+                "displayName": "SL Micro Base 6.0 ISO"
+            }
+        }
+    }
+]
diff --git a/channels/sl-micro-60-kvm.json b/channels/sl-micro-60-kvm.json
@@ -0,0 +1,28 @@
+[
+    {
+        "metadata": {
+            "name": "kvm-v2.1.1-3.34-os"
+        },
+        "spec": {
+            "version": "v2.1.1-3.34",
+            "type": "container",
+            "metadata": {
+                "upgradeImage": "registry.suse.com/suse/sl-micro/6.0/kvm-os-container:2.1.1-3.34",
+                "displayName": "SL Micro KVM 6.0 OS"
+            }
+        }
+    },
+    {
+        "metadata": {
+            "name": "kvm-v2.1.1-3.46-iso"
+        },
+        "spec": {
+            "version": "v2.1.1-3.46",
+            "type": "iso",
+            "metadata": {
+                "uri": "registry.suse.com/suse/sl-micro/6.0/kvm-iso-image:2.1.1-3.46",
+                "displayName": "SL Micro KVM 6.0 ISO"
+            }
+        }
+    }
+]
diff --git a/channels/sle-micro-5-5-kvm.json b/channels/sle-micro-5-5-kvm.json
diff --git a/channels/sle-micro-5-5-rt.json b/channels/sle-micro-5-5-rt.json