diff --git a/.obs/dockerfile/Dockerfile.sle-micro-5-5-kvm b/.obs/dockerfile/Dockerfile.sl-micro-60-baremetal similarity index 70% rename from .obs/dockerfile/Dockerfile.sle-micro-5-5-kvm rename to .obs/dockerfile/Dockerfile.sl-micro-60-baremetal index 3c32ad4..c3d216c 100644 --- a/.obs/dockerfile/Dockerfile.sle-micro-5-5-kvm +++ b/.obs/dockerfile/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 b/.obs/dockerfile/Dockerfile.sl-micro-60-base similarity index 72% rename from .obs/dockerfile/Dockerfile.sle-micro-5-5-rt rename to .obs/dockerfile/Dockerfile.sl-micro-60-base index 34265bb..b140314 100644 --- a/.obs/dockerfile/Dockerfile.sle-micro-5-5-rt +++ b/.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 b/.obs/dockerfile/Dockerfile.sl-micro-60-kvm similarity index 72% rename from .obs/dockerfile/Dockerfile.sle-micro-5-5 rename to .obs/dockerfile/Dockerfile.sl-micro-60-kvm index d1646ad..e27c37e 100644 --- a/.obs/dockerfile/Dockerfile.sle-micro-5-5 +++ b/.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 new file mode 100644 index 0000000..ef77135 --- /dev/null +++ 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 new file mode 100644 index 0000000..4727f89 --- /dev/null +++ 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 new file mode 100644 index 0000000..c6be85b --- /dev/null +++ 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 deleted file mode 100644 index 72efaf4..0000000 --- a/channels/sle-micro-5-5-kvm.json +++ /dev/null @@ -1,80 +0,0 @@ -[ - { - "metadata": { - "name": "kvm-v2.0.2-2.2.115-os" - }, - "spec": { - "version": "v2.0.2-2.2.115", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.2-2.2.115", - "displayName": "SLE Micro KVM 5.5 OS" - } - } - }, - { - "metadata": { - "name": "kvm-v2.0.2-2.2.85-os" - }, - "spec": { - "version": "v2.0.2-2.2.85", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.2-2.2.85", - "displayName": "SLE Micro KVM 5.5 OS" - } - } - }, - { - "metadata": { - "name": "kvm-v2.0.2-2.2.20-os" - }, - "spec": { - "version": "v2.0.2-2.2.20", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.2-2.2.20", - "displayName": "SLE Micro KVM 5.5 OS" - } - } - }, - { - "metadata": { - "name": "kvm-v2.0.4-3.5.69-os" - }, - "spec": { - "version": "v2.0.4-3.5.69", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.4-3.5.69", - "displayName": "SLE Micro KVM 5.5 OS" - } - } - }, - { - "metadata": { - "name": "kvm-v2.0.4-3.5.19-os" - }, - "spec": { - "version": "v2.0.4-3.5.19", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.4-3.5.19", - "displayName": "SLE Micro KVM 5.5 OS" - } - } - }, - { - "metadata": { - "name": "kvm-v2.0.4-3.5.2-os" - }, - "spec": { - "version": "v2.0.4-3.5.2", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/kvm-5.5:2.0.4-3.5.2", - "displayName": "SLE Micro KVM 5.5 OS" - } - } - } -] diff --git a/channels/sle-micro-5-5-rt.json b/channels/sle-micro-5-5-rt.json deleted file mode 100644 index 9d3822a..0000000 --- a/channels/sle-micro-5-5-rt.json +++ /dev/null @@ -1,80 +0,0 @@ -[ - { - "metadata": { - "name": "rt-v2.0.2-3.2.119-os" - }, - "spec": { - "version": "v2.0.2-3.2.119", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:2.0.2-3.2.119", - "displayName": "SLE Micro RT 5.5 OS" - } - } - }, - { - "metadata": { - "name": "rt-v2.0.2-3.2.86-os" - }, - "spec": { - "version": "v2.0.2-3.2.86", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:2.0.2-3.2.86", - "displayName": "SLE Micro RT 5.5 OS" - } - } - }, - { - "metadata": { - "name": "rt-v2.0.2-3.2.23-os" - }, - "spec": { - "version": "v2.0.2-3.2.23", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:2.0.2-3.2.23", - "displayName": "SLE Micro RT 5.5 OS" - } - } - }, - { - "metadata": { - "name": "rt-v2.0.4-4.5.76-os" - }, - "spec": { - "version": "v2.0.4-4.5.76", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:2.0.4-4.5.76", - "displayName": "SLE Micro RT 5.5 OS" - } - } - }, - { - "metadata": { - "name": "rt-v2.0.4-4.5.21-os" - }, - "spec": { - "version": "v2.0.4-4.5.21", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:2.0.4-4.5.21", - "displayName": "SLE Micro RT 5.5 OS" - } - } - }, - { - "metadata": { - "name": "rt-v2.0.4-4.5.3-os" - }, - "spec": { - "version": "v2.0.4-4.5.3", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/rt-5.5:2.0.4-4.5.3", - "displayName": "SLE Micro RT 5.5 OS" - } - } - } -] diff --git a/channels/sle-micro-5-5.json b/channels/sle-micro-5-5.json deleted file mode 100644 index bed2771..0000000 --- a/channels/sle-micro-5-5.json +++ /dev/null @@ -1,158 +0,0 @@ -[ - { - "metadata": { - "name": "v2.0.2-4.2.111-os" - }, - "spec": { - "version": "v2.0.2-4.2.111", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.111", - "displayName": "SLE Micro 5.5 OS" - } - } - }, - { - "metadata": { - "name": "v2.0.2-4.2.109-os" - }, - "spec": { - "version": "v2.0.2-4.2.109", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.109", - "displayName": "SLE Micro 5.5 OS" - } - } - }, - { - "metadata": { - "name": "v2.0.2-4.2.107-os" - }, - "spec": { - "version": "v2.0.2-4.2.107", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.2-4.2.107", - "displayName": "SLE Micro 5.5 OS" - } - } - }, - { - "metadata": { - "name": "v2.0.4-5.5.67-os" - }, - "spec": { - "version": "v2.0.4-5.5.67", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.4-5.5.67", - "displayName": "SLE Micro 5.5 OS" - } - } - }, - { - "metadata": { - "name": "v2.0.4-5.5.65-os" - }, - "spec": { - "version": "v2.0.4-5.5.65", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.4-5.5.65", - "displayName": "SLE Micro 5.5 OS" - } - } - }, - { - "metadata": { - "name": "v2.0.4-5.5.63-os" - }, - "spec": { - "version": "v2.0.4-5.5.63", - "type": "container", - "metadata": { - "upgradeImage": "registry.suse.com/suse/sle-micro/5.5:2.0.4-5.5.63", - "displayName": "SLE Micro 5.5 OS" - } - } - }, - { - "metadata": { - "name": "v2.0.2-4.2.128-iso" - }, - "spec": { - "version": "v2.0.2-4.2.128", - "type": "iso", - "metadata": { - "uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.2-4.2.128", - "displayName": "SLE Micro 5.5 ISO" - } - } - }, - { - "metadata": { - "name": "v2.0.2-4.2.97-iso" - }, - "spec": { - "version": "v2.0.2-4.2.97", - "type": "iso", - "metadata": { - "uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.2-4.2.97", - "displayName": "SLE Micro 5.5 ISO" - } - } - }, - { - "metadata": { - "name": "v2.0.2-4.2.27-iso" - }, - "spec": { - "version": "v2.0.2-4.2.27", - "type": "iso", - "metadata": { - "uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.2-4.2.27", - "displayName": "SLE Micro 5.5 ISO" - } - } - }, - { - "metadata": { - "name": "v2.0.4-5.5.75-iso" - }, - "spec": { - "version": "v2.0.4-5.5.75", - "type": "iso", - "metadata": { - "uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.4-5.5.75", - "displayName": "SLE Micro 5.5 ISO" - } - } - }, - { - "metadata": { - "name": "v2.0.4-5.5.20-iso" - }, - "spec": { - "version": "v2.0.4-5.5.20", - "type": "iso", - "metadata": { - "uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.4-5.5.20", - "displayName": "SLE Micro 5.5 ISO" - } - } - }, - { - "metadata": { - "name": "v2.0.4-5.5.6-iso" - }, - "spec": { - "version": "v2.0.4-5.5.6", - "type": "iso", - "metadata": { - "uri": "registry.suse.com/suse/sle-micro-iso/5.5:2.0.4-5.5.6", - "displayName": "SLE Micro 5.5 ISO" - } - } - } -] diff --git a/config.yaml b/config.yaml index 1b95c6f..881a786 100644 --- a/config.yaml +++ b/config.yaml @@ -1,20 +1,19 @@ watches: - - flavor: "" - fileName: "sle-micro-5-5" - displayName: "SLE Micro 5.5" - osRepo: registry.suse.com/suse/sle-micro/5.5 - isoRepo: registry.suse.com/suse/sle-micro-iso/5.5 + - flavor: "baremetal" + fileName: "sl-micro-60-baremetal" + displayName: "SL Micro 6.0" + osRepo: registry.suse.com/suse/sl-micro/6.0/baremetal-os-container + isoRepo: registry.suse.com/suse/sl-micro/6.0/baremetal-iso-image limit: 3 - flavor: "kvm" - fileName: "sle-micro-5-5-kvm" - displayName: "SLE Micro KVM 5.5" - osRepo: registry.suse.com/suse/sle-micro/kvm-5.5 - isoRepo: "N/A" + fileName: "sl-micro-60-kvm" + displayName: "SL Micro KVM 6.0" + osRepo: registry.suse.com/suse/sl-micro/6.0/kvm-os-container + isoRepo: registry.suse.com/suse/sl-micro/6.0/kvm-iso-image limit: 3 - - flavor: "rt" - fileName: "sle-micro-5-5-rt" - displayName: "SLE Micro RT 5.5" - osRepo: registry.suse.com/suse/sle-micro/rt-5.5 - isoRepo: "N/A" + - flavor: "base" + fileName: "sl-micro-60-base" + displayName: "SL Micro Base 6.0" + osRepo: registry.suse.com/suse/sl-micro/6.0/base-os-container + isoRepo: registry.suse.com/suse/sl-micro/6.0/base-iso-image limit: 3 -