test ssot

Reviewed-on: #381
Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org>

.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():
+            for code, count in counts.items():
-                print("\t"*depth, f"{code}: {count}")
+                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()

_config

@@ -1,7 +1,7 @@
 Prefer: -libqpid-proton10 -python313-urllib3_1
 Prefer: -cargo1.58 -cargo1.57 cargo1.89
 Prefer: chrony-pool-suse
-Prefer: -postgresql17-devel-mini
+Prefer: -postgresql18-devel-mini
 
 BuildFlags: excludebuild:python-pandas:test-py313
 

ironic-ipa-downloader-image/Dockerfile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.10
+#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.11
-#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.10-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.11-%RELEASE%
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
 
@@ -16,11 +16,11 @@ FROM micro AS final
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE Based Ironic IPA Downloader Container Image"
 LABEL org.opencontainers.image.description="ironic-ipa-downloader based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="3.0.10"
+LABEL org.opencontainers.image.version="3.0.11"
 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%%ironic-ipa-downloader:3.0.10-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.11-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"

ironic-ipa-downloader-image/Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.10
+#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.11
-#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.10-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.11-%RELEASE%
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
 
@@ -16,11 +16,11 @@ FROM micro AS final
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE Based Ironic IPA Downloader Container Image"
 LABEL org.opencontainers.image.description="ironic-ipa-downloader based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="3.0.10"
+LABEL org.opencontainers.image.version="3.0.11"
 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%%ironic-ipa-downloader:3.0.10-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.11-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"

ironic-ipa-downloader-image/Dockerfile.x86_64

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.10
+#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.11
-#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.10-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.11-%RELEASE%
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
 
@@ -16,11 +16,11 @@ FROM micro AS final
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE Based Ironic IPA Downloader Container Image"
 LABEL org.opencontainers.image.description="ironic-ipa-downloader based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="3.0.10"
+LABEL org.opencontainers.image.version="3.0.11"
 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%%ironic-ipa-downloader:3.0.10-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.11-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"

ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec

@@ -19,7 +19,7 @@
 
 
 Name:           ironic-ipa-ramdisk
-Version:        3.0.8
+Version:        3.0.9
 Release:        0
 Summary:        Kernel and ramdisk image for OpenStack Ironic
 License:        SUSE-EULA

ironic-ipa-ramdisk/root/etc/systemd/network/98-default.link

@@ -0,0 +1,5 @@
+[Match]
+Driver=bonding bridge
+
+[Link]
+MACAddressPolicy=none

metal3-chart/Chart.yaml

@@ -1,5 +1,5 @@
-#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.21_up0.13.0
+#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.22_up0.13.1
-#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.21_up0.13.0-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.22_up0.13.1-%RELEASE%
 apiVersion: v2
 appVersion: 0.13.0
 dependencies:
@@ -10,7 +10,7 @@ dependencies:
 - alias: metal3-ironic
   name: ironic
   repository: file://./charts/ironic
-  version: 0.12.1
+  version: 0.12.2
 - 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.21+up0.13.0"
+version: "%%CHART_MAJOR%%.0.22+up0.13.1"

metal3-chart/charts/ironic/Chart.yaml

@@ -3,4 +3,4 @@ appVersion: 32.0.0
 description: A Helm chart for Ironic, used by Metal3
 name: ironic
 type: application
-version: 0.12.1
+version: 0.12.2

metal3-chart/charts/ironic/values.yaml

@@ -68,7 +68,7 @@ images:
   ironicIPADownloader:
     repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic-ipa-downloader
     pullPolicy: IfNotPresent
-    tag: 3.0.10
+    tag: 3.0.11
 
 nameOverride: ""
 fullnameOverride: ""

release-manifest-image/Dockerfile

@@ -20,4 +20,4 @@ LABEL com.suse.image-type="release-manifest"
 LABEL com.suse.release-stage="released"
 # endlabelprefix
 
-COPY release_manifest.yaml release_images.yaml ./
+COPY release_manifest.yaml release_images.yaml tooling_manifest.yaml ./

release-manifest-image/_service

@@ -18,5 +18,16 @@
     <param name="var">CHART_REPO</param>
     <param name="eval">CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
     <param name="var">CHART_MAJOR</param>
+</service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">tooling_manifest.yaml</param>
+    <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
+    <param name="var">IMG_PREFIX</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_repo)</param>
+    <param name="var">IMG_REPO</param>
+    <param name="eval">KIWI_VERSION=$(rpm --macros=/root/.rpmmacros -E %kiwi_version)</param>
+    <param name="var">KIWI_VERSION</param>
+    <param name="eval">EIB_VERSION=$(rpm --macros=/root/.rpmmacros -E %eib_version)</param>
+    <param name="var">EIB_VERSION</param>
   </service>
 </services>

release-manifest-image/release_images.yaml

@@ -5,7 +5,7 @@ images:
   - name: %%IMG_REPO%%/%%IMG_PREFIX%%baremetal-operator:0.11.2.0
   - name: %%IMG_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator:0.3.0
   - name: %%IMG_REPO%%/%%IMG_PREFIX%%ib-sriov-cni:v1.3.0
-  - name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.10
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.11
   - name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic:32.0.0.1
   - name: %%IMG_REPO%%/%%IMG_PREFIX%%metallb-controller:v0.15.2
   - name: %%IMG_REPO%%/%%IMG_PREFIX%%metallb-speaker:v0.15.2

release-manifest-image/release_manifest.yaml

@@ -161,11 +161,15 @@ spec:
         - prettyName: Metal3
           releaseName: metal3
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%metal3'
-          version: '%%CHART_MAJOR%%.0.21+up0.13.0'
+          version: '%%CHART_MAJOR%%.0.22+up0.13.1'
         - prettyName: RancherTurtlesProviders
           releaseName: rancher-turtles-providers
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles-providers'
           version: '%%CHART_MAJOR%%.0.4+up0.25.1'
+        - prettyName: Upgrade Controller
+          releaseName: upgrade-controller
+          chart: '%%CHART_REPO%%/%%CHART_PREFIX%%upgrade-controller'
+          version: '%%CHART_MAJOR%%.0.3+up0.1.3'
         - prettyName: CertManager
           releaseName: cert-manager
           chart: cert-manager

release-manifest-image/tooling_manifest.yaml

@@ -0,0 +1,7 @@
+kiwi:
+  version: "10.2.29.1"
+  image: "%%IMG_REPO%%/%%IMG_PREFIX%%kiwi-builder:10.2.29.1"
+
+eib:
+  version: "1.3.2"
+  image: "%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.3.2"