From be4fae4b188b42d7b22510b3f7dca554bae6b36ff0e87feb55c8bc3e37030176 Mon Sep 17 00:00:00 2001 From: Denislav Prodanov Date: Wed, 20 Nov 2024 11:49:54 +0200 Subject: [PATCH 1/4] 3.2 branching --- .obs/common.py | 4 +- .obs/workflows.yml | 224 ++++++++++++++++++++++----------------------- 2 files changed, 114 insertions(+), 114 deletions(-) diff --git a/.obs/common.py b/.obs/common.py index ede08bb..89a38f0 100644 --- a/.obs/common.py +++ b/.obs/common.py @@ -1,3 +1,3 @@ -PROJECT = "isv:SUSE:Edge:Factory" +PROJECT = "isv:SUSE:Edge:3.2" REPOSITORY = "https://src.opensuse.org/suse-edge/Factory" -BRANCH = "main" +BRANCH = "3.2" diff --git a/.obs/workflows.yml b/.obs/workflows.yml index 82231a8..d89a4f4 100644 --- a/.obs/workflows.yml +++ b/.obs/workflows.yml @@ -4,225 +4,225 @@ staging_build: steps: - branch_package: source_package: endpoint-copier-operator - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: endpoint-copier-operator-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: endpoint-copier-operator-chart - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: akri - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: akri-agent-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: akri-chart - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: akri-controller-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: akri-dashboard-extension-chart - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: akri-debug-echo-discovery-handler-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: akri-onvif-discovery-handler-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: akri-opcua-discovery-handler-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: akri-udev-discovery-handler-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: akri-webhook-configuration-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: obs-service-set_version - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: cosign - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: frr-k8s - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: kubectl - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: upgrade-controller - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: nm-configurator - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: kube-rbac-proxy - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: edge-image-builder - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: metallb - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: hauler - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: ip-address-manager - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: baremetal-operator - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: cluster-api-provider-metal3 - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: cdi-chart - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: cluster-api-provider-metal3-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: metallb-chart - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: sriov-crd-chart - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: upgrade-controller-chart - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: edge-image-builder-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: ironic-ipa-downloader-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: upgrade-controller-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: metal3-chart - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: baremetal-operator-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: sriov-network-operator-chart - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: metallb-controller-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: ip-address-manager-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: metallb-speaker-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: ironic-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: cri-tools - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: crudini - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: fakeroot - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: ipcalc - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: autoconf - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: rancher-turtles-airgap-resources-chart - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: rancher-turtles-chart - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: kube-rbac-proxy-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: ironic-ipa-ramdisk - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: kubevirt-dashboard-extension-chart - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: kiwi-builder-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: kubevirt-chart - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: release-manifest-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: frr-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging - branch_package: source_package: kubectl-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging + source_project: isv:SUSE:Edge:3.2 + target_project: isv:SUSE:Edge:3.2:Staging From da2ad7795116bcef09b6b873405ba0a1bf238efb7800a802770d3ee2c82b4b01 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Wed, 27 Nov 2024 08:23:32 +0000 Subject: [PATCH 2/4] 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 636493adbafb69b6bb0f65d50fe63441b5a3e8602f552cf325867b0b027c7c60) --- rancher-turtles-chart/templates/metal3-infrastructure.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rancher-turtles-chart/templates/metal3-infrastructure.yaml b/rancher-turtles-chart/templates/metal3-infrastructure.yaml index 098468f..122d9c4 100644 --- a/rancher-turtles-chart/templates/metal3-infrastructure.yaml +++ b/rancher-turtles-chart/templates/metal3-infrastructure.yaml @@ -16,6 +16,9 @@ kind: ClusterctlConfig metadata: name: clusterctl-config namespace: rancher-turtles-system + annotations: + "helm.sh/hook": "post-install, post-upgrade" + "helm.sh/hook-weight": "1" spec: providers: - name: metal3 From 755504891788b83c7f7a3cad5e89feb9d0b1316eaf32ca91956e2af07aa33bd2 Mon Sep 17 00:00:00 2001 From: Denislav Prodanov Date: Thu, 28 Nov 2024 16:57:54 +0200 Subject: [PATCH 3/4] updated longhorn and neuvector to latest 105 charts --- release-manifest-image/release_manifest.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml index 1cae759..2d0865e 100644 --- a/release-manifest-image/release_manifest.yaml +++ b/release-manifest-image/release_manifest.yaml @@ -28,12 +28,12 @@ spec: - prettyName: Longhorn releaseName: longhorn chart: longhorn - version: 104.2.1+up1.7.2 + version: 105.1.0+up1.7.2 repository: https://charts.rancher.io dependencyCharts: - releaseName: longhorn-crd chart: longhorn-crd - version: 104.2.1+up1.7.2 + version: 105.1.0+up1.7.2 repository: https://charts.rancher.io - prettyName: MetalLB releaseName: metallb @@ -54,18 +54,18 @@ spec: - prettyName: NeuVector releaseName: neuvector chart: neuvector - version: 104.0.2+up2.8.0 + version: 105.0.0+up2.8.3 repository: https://charts.rancher.io dependencyCharts: - releaseName: neuvector-crd chart: neuvector-crd - version: 104.0.2+up2.8.0 + version: 105.0.0+up2.8.3 repository: https://charts.rancher.io addonCharts: - releaseName: neuvector-ui-ext chart: neuvector-ui-ext repository: https://github.com/rancher/ui-plugin-charts/raw/main - version: 2.0.0 + version: 2.0.1 - prettyName: EndpointCopierOperator releaseName: endpoint-copier-operator chart: %%CHART_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator-chart From 744d04b40ad1efbac2d625387710bbd3a6db0805a3d16279a22d992336ee0138 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Fri, 29 Nov 2024 18:42:00 +0000 Subject: [PATCH 4/4] 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 8a93aae7c5f649dcb6aedb7f4691e925c1342dcbdcf21e15bb761512a173f92f) --- kiwi-builder-image/Dockerfile | 11 +++---- kiwi-builder-image/README | 22 +++++++++---- kiwi-builder-image/build-image.sh | 54 ++++++++++++++++--------------- 3 files changed, 47 insertions(+), 40 deletions(-) diff --git a/kiwi-builder-image/Dockerfile b/kiwi-builder-image/Dockerfile index 99328b7..4ff28c9 100644 --- a/kiwi-builder-image/Dockerfile +++ b/kiwi-builder-image/Dockerfile @@ -1,5 +1,6 @@ -#!BuildTag: kiwi-builder:10.1 -FROM registry.suse.com/bci/kiwi:10.1.10 +#!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/) # Define labels according to https://en.opensuse.org/Building_derived_containers @@ -11,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" +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" @@ -20,10 +21,6 @@ LABEL com.suse.image-type="application" LABEL com.suse.release-stage="released" # endlabelprefix -# Install required packages for Kiwi to function as expected -# Should be provided via https://github.com/SUSE/BCI-dockerfile-generator/pull/1770 -# RUN zypper in -y gawk && zypper clean -a - # Configure Kiwi to use kpartx RUN echo -e "mapper:\n - part_mapper: kpartx" > /etc/kiwi.yml diff --git a/kiwi-builder-image/README b/kiwi-builder-image/README index bdfa204..b74c156 100644 --- a/kiwi-builder-image/README +++ b/kiwi-builder-image/README @@ -8,32 +8,40 @@ Please ensure that you're running this on a registered SLE Micro 6.0 system, and Next, download the podman image: -# podman pull %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 +# podman pull %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 Make a local output directory (where the images will reside): # mkdir output +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.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.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 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 -p Default -To build a SelfInstall ISO, you can add additional flags, for example: +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 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 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 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 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: diff --git a/kiwi-builder-image/build-image.sh b/kiwi-builder-image/build-image.sh index 0725537..b0df0ba 100644 --- a/kiwi-builder-image/build-image.sh +++ b/kiwi-builder-image/build-image.sh @@ -21,43 +21,45 @@ # # Set image build defaults, blocksize is an empty string -PROFILE="Default" +PROFILE="Base" LARGEBLOCK=false # Print usage usage(){ - cat <<-EOF - ============================== - SLE Micro 6.0 Kiwi SDK Builder - ============================== + cat <<-EOF + ============================== + SLE Micro 6.0 Kiwi SDK Builder + ============================== - Usage: ${0} [-p ] [-b] + Usage: ${0} [-p ] [-b] - Profile Options (-p): - * Default: RAW Disk Image with kernel-default - * Default-SelfInstall: SelfInstall ISO with kernel-default - * Base-RT: RAW Disk Image with kernel-rt - * Base-RT-SelfInstall: SelfInstall ISO with kernel-rt + Profile Options (-p): + * Base: RAW Disk Image with podman + * Base-SelfInstall: SelfInstall ISO with podman + * Default: RAW Disk Image with podman and kvm + * Default-SelfInstall: SelfInstall ISO with podman and kvm + * Base-RT: RAW Disk Image with kernel-rt + * Base-RT-SelfInstall: SelfInstall ISO with kernel-rt - 4096 Blocksize (-b): If specified, use a 4096 blocksize (rather than 512) when generating the image. + 4096 Blocksize (-b): If specified, use a 4096 blocksize (rather than 512) when generating the image. - NOTE: If both options are omitted, the "Default" profile with a standard "512" blocksize is used. - EOF + NOTE: If both options are omitted, the "Base" profile with a standard "512" blocksize is used. +EOF } # Grab CLI options and handle while getopts 'p:bh' OPTION; do - case "${OPTION}" in - p) - PROFILE="${OPTARG}" - ;; - b) - LARGEBLOCK=true - ;; - ?) - usage && exit 2 - ;; - esac + case "${OPTION}" in + p) + PROFILE="${OPTARG}" + ;; + b) + LARGEBLOCK=true + ;; + ?) + usage && exit 2 + ;; + esac done # To avoid wasting time, perform the loop creation test first, and exit with a warning to re-run. @@ -88,4 +90,4 @@ if [ $RESULT -eq 0 ]; then echo -e "\n\nINFO: Image build successful, generated images are available in the 'output' directory." else echo -e "\n\nERROR: Failed to build the image, please see above logs." -fi \ No newline at end of file +fi