Use archful repo ids in image build ubi.repo

Tweak the /etc/yum.repo.d/ubu.repo file so the rpms in the SBOM use
the rpm repo id that includes the arch, for example,
ubi-9-for-$basearch-baseos-rpms instead of ubi-9-baseos-rpms.

This should avoid some `rpm_repos.ids_known` Conforma violations.

The reason the change is needed now is due to
release-engineering/rhtap-ec-policy#99 .
See also https://issues.redhat.com/browse/KONFLUX-6218 .

Ref: https://issues.redhat.com/browse/EC-1134

Author: simonbaird

Dockerfile

@@ -59,7 +59,11 @@ LABEL \
   io.openshift.tags="conforma ec opa cosign sigstore"
 
 # Install tools we want to use in the Tekton task
-RUN microdnf upgrade --assumeyes --nodocs --setopt=keepcache=0 --refresh && microdnf -y --nodocs --setopt=keepcache=0 install git-core jq
+# Sed replace to use archful repo ids for better SBOM data
+RUN \
+  sed -i /etc/yum.repos.d/ubi.repo -e 's/^\[ubi-9-/\[ubi-9-for-$basearch-/' && \
+  microdnf upgrade --assumeyes --nodocs --setopt=keepcache=0 --refresh && \
+  microdnf -y --nodocs --setopt=keepcache=0 install git-core jq
 
 # Copy all the binaries so they're available to extract and download
 # (Beware if you're testing this locally it will copy everything from

Dockerfile.dist

@@ -62,7 +62,11 @@ LABEL \
   com.redhat.component="ec-cli"
 
 # Install tools we want to use in the Tekton task
-RUN microdnf upgrade --assumeyes --nodocs --setopt=keepcache=0 --refresh && microdnf -y --nodocs --setopt=keepcache=0 install git-core jq
+# Sed replace to use archful repo ids for better SBOM data
+RUN \
+  sed -i /etc/yum.repos.d/ubi.repo -e 's/^\[ubi-9-/\[ubi-9-for-$basearch-/' && \
+  microdnf upgrade --assumeyes --nodocs --setopt=keepcache=0 --refresh && \
+  microdnf -y --nodocs --setopt=keepcache=0 install git-core jq
 
 # Copy all the binaries so they're available to extract and download
 # (Beware if you're testing this locally it will copy everything from