Merge pull request #2209 from openshift-cherrypick-robot/cherry-pick-2208-to-release-4.20

[release-4.20] OCPBUGS-77170: Install subscription-manager in required images

Author: sdodson

images/cli/Dockerfile.rhel

@@ -5,6 +5,7 @@ RUN make build --warn-undefined-variables
 
 FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
 COPY --from=builder /go/src/github.com/openshift/oc/oc /usr/bin/
+RUN dnf install -y subscription-manager && dnf clean all && rm -rf /var/cache/dnf/*
 RUN for i in kubectl openshift-deploy openshift-docker-build openshift-sti-build openshift-git-clone openshift-manage-dockerfile openshift-extract-image-content openshift-recycle; do ln -sf /usr/bin/oc /usr/bin/$i; done
 LABEL io.k8s.display-name="OpenShift Client" \
       io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \

images/tools/Dockerfile

@@ -39,6 +39,7 @@ RUN INSTALL_PKGS="\
   s-nail \
   strace \
   stress-ng \
+  subscription-manager \
   sysstat \
   tcpdump \
   tmux \
@@ -47,7 +48,7 @@ RUN INSTALL_PKGS="\
   wget \
   xfsprogs \
   " && \
-  yum -y install $INSTALL_PKGS && rpm -V --nosize --nofiledigest --nomtime --nomode $INSTALL_PKGS && yum clean all && rm -rf /var/cache/*
+  yum -y install $INSTALL_PKGS && rpm -V --nogroup --nosize --nofiledigest --nomtime --nomode $INSTALL_PKGS && yum clean all && rm -rf /var/cache/*
   # Disabled until they are buildable on s390x
   # numactl \
   # numactl-devel \