From e9fcb2e7987c37efc761f4c04a261c60c99a9959 Mon Sep 17 00:00:00 2001 From: Roshan-R Date: Tue, 4 Nov 2025 12:31:22 +0530 Subject: [PATCH] cmd-build-with-buildah: remove temporary stream label hack Remove the temporary workaround that manually set the `fedora-coreos.stream` label during image builds. This label is now applied directly by rpm-ostree through the build process, making the extra logic unnecessary and simplifying `cmd-build-with-buildah`. See: https://github.com/coreos/coreos-assembler/issues/4337 --- src/cmd-build-with-buildah | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/cmd-build-with-buildah b/src/cmd-build-with-buildah index 3fa1b25b76..b1c6a74470 100755 --- a/src/cmd-build-with-buildah +++ b/src/cmd-build-with-buildah @@ -167,15 +167,6 @@ build_with_buildah() { --label org.opencontainers.image.source="${source}" \ --label org.opencontainers.image.revision="${commit}" - # XXX: Temporary hack until we have https://github.com/coreos/rpm-ostree/pull/5454 - # which would allow us to fold this back into the build process. - # shellcheck source=/dev/null - stream=$(yaml2json "$manifest" /dev/stdout | jq -r '.variables.stream') - if [ "${stream}" != null ]; then - set -- "$@" --label fedora-coreos.stream="$stream" \ - --annotation fedora-coreos.stream="$stream" - fi - if [ -d "src/yumrepos" ] && [ -e "src/yumrepos/${variant:-}.repo" ]; then set -- "$@" --secret id=yumrepos,src="$(realpath "src/yumrepos/$variant.repo")" \ --secret id=contentsets,src="$(realpath src/yumrepos/content_sets.yaml)" \