build openshift-tests in one image to phase in new images

Author: deads2k

images/tests/Dockerfile.rhel

@@ -4,9 +4,13 @@ COPY . .
 RUN make build WHAT=cmd/openshift-tests-kubernetes; \
     mkdir -p /tmp/build; \
     cp /go/src/github.com/openshift/origin/_output/local/bin/linux/$(go env GOARCH)/openshift-tests-kubernetes /tmp/build/openshift-tests-kubernetes
+RUN make build WHAT=cmd/openshift-tests; \
+    mkdir -p /tmp/build; \
+    cp /go/src/github.com/openshift/origin/_output/local/bin/linux/$(go env GOARCH)/openshift-tests /tmp/build/openshift-tests
 
-FROM registry.svc.ci.openshift.org/ocp/4.2:tests-base
+FROM registry.svc.ci.openshift.org/ocp/4.2:cli
 COPY --from=builder /tmp/build/openshift-tests-kubernetes /usr/bin/
+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 && \
     git config --system user.email [email protected] && \