Merge pull request #25442 from openshift-bot/updating-images/tests/do…

…ckerfile.rhel-baseimages-to-mach-ocp-build-data-config

Bug 1872080: Updating images/tests/Dockerfile.rhel baseimages to mach ocp-build-data config

images/tests/Dockerfile.rhel

@@ -1,11 +1,11 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.14 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder
 WORKDIR /go/src/github.com/openshift/origin
 COPY . .
 RUN make; \
     mkdir -p /tmp/build; \
     cp /go/src/github.com/openshift/origin/openshift-tests /tmp/build/openshift-tests
 
-FROM registry.svc.ci.openshift.org/ocp/4.2:cli
+FROM registry.svc.ci.openshift.org/ocp/4.6:tools
 COPY --from=builder /tmp/build/openshift-tests /usr/bin/
 RUN yum install --setopt=tsflags=nodocs -y git gzip util-linux && yum clean all && rm -rf /var/cache/yum/* && \
     git config --system user.name test && \