From 51e149dfeafb2b0e6aa7a4a92a85eb508665818e Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 4 Feb 2025 14:16:00 -0500 Subject: [PATCH] extensions: include release and arch in extensions.json `%{version}` just prints the version field, but we want the epoch, release, and arch too. This matches what we previously would output before moving extensions building to a container. There is code that will parse this metadata assuming that it's an EVRA: https://github.com/openshift-eng/art-tools/blob/6a29949b2b2819afe00829646e6c7db9b784ff8a/doozer/doozerlib/rhcos.py#L248 --- extensions/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/Dockerfile b/extensions/Dockerfile index 37b45401..ec870a64 100644 --- a/extensions/Dockerfile +++ b/extensions/Dockerfile @@ -35,7 +35,7 @@ RUN createrepo_c /usr/share/rpm-ostree/extensions/ RUN sh -c 'echo "{" > /tmp/extensions.json && \ dnf repoquery --repofrompath=extensions,/usr/share/rpm-ostree/extensions/ \ --quiet --disablerepo=* --enablerepo=extensions \ - --queryformat "\"%{name}\": \"%{version}\"," | \ + --queryformat "\"%{name}\": \"%{evr}.%{arch}\"," | \ sed "$ s/,$//" >> /tmp/extensions.json && \ echo "}" >> /tmp/extensions.json'