Fix issues with config and meta when releasing

Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>
2025-05-27 12:09:12 +02:00
parent be87fb0fc6
commit f2d39a7025
2 changed files with 13 additions and 1 deletions
--- a/11
+++ b/11
@@ -108,7 +108,12 @@ BuildFlags: onlybuild:release-manifest-image

    # Publish multi-arch container images only once all archs have been built
    PublishFlags: archsync
+    
+    # skopeo and umoci are used by build scripts to list packages
+    Substitute: system-packages:podman podman buildah createrepo_c release-compare skopeo umoci
+%endif

+%if "%_repository" == "images"
    # skopeo and umoci are used by build scripts to list packages
    Substitute: system-packages:podman podman buildah createrepo_c release-compare edge-build-checks skopeo umoci

@@ -122,6 +127,8 @@ BuildFlags: onlybuild:release-manifest-image
    Patterntype: none
    BuildFlags: dockerarg:SLE_VERSION=16.0
    BuildFlags: onlybuild:kiwi-builder-image
+    
+    Substitute: system-packages:podman podman buildah createrepo_c release-compare skopeo umoci

    # Publish multi-arch container images only once all archs have been built
    PublishFlags: archsync
@@ -140,7 +147,9 @@ BuildFlags: onlybuild:release-manifest-image
    %endif

 %else
-    BuildFlags: excludebuild:kiwi-builder-image
+    %if "%{sub %{reverse %_project} 1 7}" != "%{reverse :ToTest}" && "%{sub %{reverse %_project} 1 9}" != "%{reverse :Snapshot}"
+      BuildFlags: excludebuild:kiwi-builder-image
+    %endif
 %endif


--- a/3
+++ b/3
@@ -23,6 +23,9 @@
    <disable/>
    <enable repository="charts"/>
    <enable repository="test_manifest_images"/>
+    {%- if for_release %}
+    <enable repository="releasecharts"/>
+    {%- endif %}
  </build>
  <publish>
    <disable repository="phantomcharts"/>