update EIB to v1.3.3-rc0

Reviewed-on: suse-edge/Factory#388
Co-authored-by: dbw7 <danial.bekhit@suse.com>
Co-committed-by: dbw7 <danial.bekhit@suse.com>

.obs/common.py

@@ -1,3 +1,3 @@
-PROJECT = "isv:SUSE:Edge:3.5"
+PROJECT = "isv:SUSE:Edge:Factory"
 REPOSITORY = "https://src.opensuse.org/suse-edge/Factory"
-BRANCH = "3.5"
+BRANCH = "main"

.obs/wait_obs.py

@@ -6,6 +6,7 @@ import sys
 
 from collections import Counter
 
+
 def get_buildstatus(project: str) -> ET.Element:
     for _ in range(5):
         try:
@@ -17,8 +18,17 @@ def get_buildstatus(project: str) -> ET.Element:
             continue
     print("Failed to get buildstatus from OBS")
 
-def do_wait(project:str, commit:str) -> ET.Element:
+
+def do_wait(project: str, commit: str) -> ET.Element:
     last_state = None
+    waiting_states = (
+        "blocked",
+        "scheduled",
+        "dispatching",
+        "building",
+        "signing",
+        "finished",
+    )
     while True:
         time.sleep(5)
         status = get_buildstatus(project)
@@ -33,17 +43,25 @@ def do_wait(project:str, commit:str) -> ET.Element:
         else:
             last_state = status.get("state")
 
-        scminfo = { e.text for e in status.findall(".//scminfo") }
+        scminfo = {e.text for e in status.findall(".//scminfo")}
         if len(scminfo) != 1 or scminfo.pop() != commit:
             print("Waiting for OBS to sync with SCM")
             continue
 
-        if not all([ e.get('state') == "published" and e.get('dirty') is None for e in status.findall("./result")]):
+        if not all(
+            [
+                e.get("state") == "published"  # Only consider if all packages are published
+                and e.get("dirty") is None  # Exclude states needing recalculation
+                and e.get("code") not in waiting_states  # Exclude transient/waiting states
+                for e in status.findall("./result")
+            ] + [ e.get("code") not in waiting_states for e in status.findall("./status") ]
+        ):
             print("Waiting for OBS to finish building")
             continue
 
         return status
-        
+
+
 def print_results(status: ET.Element) -> bool:
     results = {}
     failed = []
@@ -51,15 +69,15 @@ def print_results(status: ET.Element) -> bool:
         repo = results.get(e.get("repository"), {})
         repo[e.get("arch")] = e
         results[e.get("repository")] = repo
-    
+
     for repo in results.keys():
         print(f"{repo}:")
-        depth=1
+        depth = 1
         for arch in results[repo].keys():
             counts = Counter()
             if repo != "charts":
                 print(f"\t{arch}:")
-                depth=2
+                depth = 2
             for package in results[repo][arch].findall("./status"):
                 if package.get("code") in ["excluded", "disabled"]:
                     continue
@@ -70,9 +88,9 @@ def print_results(status: ET.Element) -> bool:
                     else:
                         failed.append(f"{package.get('package')} ({arch})")
                 counts[package.get("code")] += 1
-            for (code, count) in counts.items():
-                print("\t"*depth, f"{code}: {count}")
-    
+            for code, count in counts.items():
+                print("\t" * depth, f"{code}: {count}")
+
     failed.sort()
     if failed:
         print("\nPackages failing: ")
@@ -80,6 +98,7 @@ def print_results(status: ET.Element) -> bool:
         print("\t", fail)
     return len(failed)
 
+
 def main():
     project = os.environ.get("OBS_PROJECT")
     sha = os.environ.get("GIT_SHA")
@@ -87,5 +106,6 @@ def main():
     status = do_wait(project, sha)
     sys.exit(print_results(status))
 
+
 if __name__ == "__main__":
     main()

edge-image-builder-image/Dockerfile

@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.2
-#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.2-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.3-rc0
+#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.3-rc0-%RELEASE%
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-base:$SLE_VERSION
 MAINTAINER SUSE LLC (https://www.suse.com/)
@@ -14,11 +14,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="1.3.2"
+LABEL org.opencontainers.image.version="1.3.3-rc0"
 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:1.3.2-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.3.3-rc0-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"

edge-image-builder/_service

@@ -3,15 +3,15 @@
     <param name="url">https://github.com/suse-edge/edge-image-builder.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="revision">v1.3.2</param>
+    <param name="revision">v1.3.3-rc0</param>
     <!-- Uncomment and set this For Pre-Release Version -->
-    <!-- <param name="version">1.3.2~rc0</param> -->
+    <param name="version">1.3.3~rc0</param>
     <!-- End Here -->
 
-    <!-- Uncomment and this for regular version -->
-    <param name="versionformat">@PARENT_TAG@</param>
+    <!-- Uncomment and set this for regular version -->
+    <!-- <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(\d+).(\d+).(\d+)</param>
-    <param name="versionrewrite-replacement">\1.\2.\3</param>
+    <param name="versionrewrite-replacement">\1.\2.\3</param> -->
     <!-- End Here -->
 
     <param name="changesgenerate">enable</param>

edge-image-builder/edge-image-builder.spec

@@ -17,7 +17,7 @@
 
 
 Name:           edge-image-builder
-Version:        1.3.2
+Version:        1.3.3-rc0
 Release:        0
 Summary:        Edge Image Builder
 License:        Apache-2.0

hauler/_service

@@ -4,7 +4,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="scm">git</param>
     <param name="exclude">.get</param>
-    <param name="revision">v1.2.5</param>
+    <param name="revision">v1.4.1</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="changesgenerate">enable</param>
   </service>

hauler/hauler.spec

@@ -18,13 +18,14 @@
 %define project github.com/hauler-dev/hauler
 
 Name:           hauler
-Version:        1.2.5
+Version:        1.4.1
 Release:        0
 Summary:        Airgap Swiss Army Knife
 License:        Apache-2.0
 URL:            https://github.com/hauler-dev/hauler
 Source:         hauler-%{version}.tar
 Source1:        vendor.tar.gz
+BuildRequires:  golang(API) = 1.25
 BuildRequires:  golang-packaging
 
 %description

metal3-chart/Chart.yaml

@@ -1,5 +1,5 @@
-#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.22_up0.13.1
-#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.22_up0.13.1-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.23_up0.13.1
+#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.23_up0.13.1-%RELEASE%
 apiVersion: v2
 appVersion: 0.13.0
 dependencies:
@@ -15,7 +15,7 @@ dependencies:
   condition: global.enable_mariadb
   name: mariadb
   repository: file://./charts/mariadb
-  version: 0.6.2
+  version: 0.6.3
 - alias: metal3-media
   condition: global.enable_metal3_media_server
   name: media
@@ -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.22+up0.13.1"
+version: "%%CHART_MAJOR%%.0.23+up0.13.1"

metal3-chart/charts/mariadb/Chart.yaml

@@ -3,4 +3,4 @@ appVersion: "11.8"
 description: A Helm chart for MariaDB, used by Metal3
 name: mariadb
 type: application
-version: 0.6.2
+version: 0.6.3

metal3-chart/charts/mariadb/templates/deployment.yaml

@@ -20,7 +20,7 @@ spec:
       labels:
         {{- include "mariadb.selectorLabels" . | nindent 8 }}
     spec:
-      {{- $volmounts := toYaml .Values.volumeMounts | trim | nindent 12 }}
+      {{- $volmounts := toYaml .Values.volumeMounts | trim | nindent 10 }}
       {{- $volumes := toYaml .Values.volumes | trim | nindent 8 }}
       serviceAccountName: {{ include "mariadb.serviceAccountName" . }}
       securityContext:
@@ -103,11 +103,11 @@ spec:
           successThreshold: 1
           timeoutSeconds: 10
         volumeMounts:
-            - name: mariadb-conf
-              mountPath: /etc/mysql/conf.d
-            - name: mariadb-run
-              mountPath: /run/mysql
-            {{- $volmounts }}
+          - name: mariadb-conf
+            mountPath: /etc/mysql/conf.d
+          - name: mariadb-run
+            mountPath: /run/mysql
+          {{- $volmounts }}
       {{- with .Values.global.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

release-manifest-image/Dockerfile

@@ -1,4 +1,4 @@
-#!BuildTag: %%IMG_PREFIX%%release-manifest:3.5.0
+#!BuildTag: %%IMG_PREFIX%%release-manifest:3.6.0
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION
 
@@ -7,11 +7,11 @@ FROM registry.suse.com/bci/bci-micro:$SLE_VERSION
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SUSE Edge Release Manifest"
 LABEL org.opencontainers.image.description="Release Manifest containing information about a specific SUSE Edge release"
-LABEL org.opencontainers.image.version="3.5.0"
+LABEL org.opencontainers.image.version="3.6.0"
 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%%release-manifest:3.5.0"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%release-manifest:3.6.0"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"

release-manifest-image/release_manifest.yaml

@@ -1,9 +1,9 @@
 apiVersion: lifecycle.suse.com/v1alpha1
 kind: ReleaseManifest
 metadata:
-  name: release-manifest-3-5-1
+  name: release-manifest-3-6-0
 spec:
-  releaseVersion: 3.5.1
+  releaseVersion: 3.6.0
   components:
     kubernetes:
       k3s:
@@ -92,9 +92,8 @@ spec:
               enabled: false
         - prettyName: Longhorn
           releaseName: longhorn
-          chart: suse-storage
+          chart: oci://dp.apps.rancher.io/charts/suse-storage
           version: 1.10.1
-          repository: oci://dp.apps.rancher.io/charts
         - prettyName: MetalLB
           releaseName: metallb
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%metallb'
@@ -162,7 +161,7 @@ spec:
         - prettyName: Metal3
           releaseName: metal3
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%metal3'
-          version: '%%CHART_MAJOR%%.0.22+up0.13.1'
+          version: '%%CHART_MAJOR%%.0.23+up0.13.1'
         - prettyName: RancherTurtlesProviders
           releaseName: rancher-turtles-providers
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles-providers'