Skip to content

Commit

Permalink
images/tests/Dockerfile*: Install gzip for compressing logs
Browse files Browse the repository at this point in the history
This image is primarily intended for running the test suite against an
external cluster, but it's also a convenient place to collect the
tools needed to retrieve and store logs extracted from those tested
clusters.  If the inspection dependencies become too onerous, we might
want to split them out into their own image, but for now it seems
easier to overload tests.

It's not clear to me why only the RHEL Dockerfile lists util-linux,
which it has since 228e3f5 (Add git to the test image to ensure we
can perform new-app tests, 2019-02-17, openshift#22065), but I've left that
part alone.
  • Loading branch information
wking committed Feb 20, 2019
1 parent 5404080 commit b16dcfc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions images/tests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ FROM openshift/origin-cli
RUN INSTALL_PKGS=" \
origin-tests \
git \
gzip \
" && \
yum --enablerepo=origin-local-release install -y ${INSTALL_PKGS} && \
rpm -V ${INSTALL_PKGS} && \
Expand Down
2 changes: 1 addition & 1 deletion images/tests/Dockerfile.rhel
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN make build WHAT=cmd/openshift-tests

FROM registry.svc.ci.openshift.org/ocp/4.0:cli
COPY --from=builder /go/src/github.com/openshift/origin/_output/local/bin/linux/amd64/openshift-tests /usr/bin/
RUN yum install --setopt=tsflags=nodocs -y git util-linux && yum clean all && rm -rf /var/cache/yum/* && \
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 test@test.com
LABEL io.k8s.display-name="OpenShift End-to-End Tests" \
Expand Down

0 comments on commit b16dcfc

Please sign in to comment.