From d7f3af7ff323029f01bdf50c3af40160a417a624 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 19:20:13 +0000 Subject: [PATCH] Updating images/tests/Dockerfile.rhel baseimages to mach ocp-build-data config This PR is autogenerated by the [ocp-build-data-enforcer][1]. It updates the baseimages in the Dockerfile used for promotion in order to ensure it matches the configuration in the [ocp-build-data repository][2] used for producing release artifacts. If you believe the content of this PR is incorrect, please contact the dptp team in #forum-testplatform. [1]: https://github.com/openshift/ci-tools/tree/master/cmd/ocp-build-data-enforcer [2]: https://github.com/openshift/ocp-build-data/tree/openshift-4.6-rhel-8/images --- images/tests/Dockerfile.rhel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/tests/Dockerfile.rhel b/images/tests/Dockerfile.rhel index 0df336df0fe9..1d277cac81c7 100644 --- a/images/tests/Dockerfile.rhel +++ b/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 && \