Skip to content

Commit

Permalink
Do not install python3-cinderclient on s390x
Browse files Browse the repository at this point in the history
The openstack repository does not yet exist for s390x, where
python3-cinderclient should be coming from. Safelisting the
existing arches.
  • Loading branch information
joepvd committed May 18, 2021
1 parent 8b459c2 commit 5c861b5
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion images/tests/Dockerfile.rhel
Expand Up @@ -7,7 +7,9 @@ RUN make; \

FROM registry.ci.openshift.org/ocp/4.8:tools
COPY --from=builder /tmp/build/openshift-tests /usr/bin/
RUN yum install --setopt=tsflags=nodocs -y git gzip util-linux python3-cinderclient && yum clean all && rm -rf /var/cache/yum/* && \
RUN PACKAGES="git gzip util-linux" && \
if [ $HOSTTYPE = x86_64] || [ $HOSTTYPE = ppc64le ]; then PACKAGES="$PACKAGES python3-cinderclient"; fi && \
yum install --setopt=tsflags=nodocs -y $PACKAGES && yum clean all && rm -rf /var/cache/yum/* && \
git config --system user.name test && \
git config --system user.email test@test.com && \
chmod g+w /etc/passwd
Expand Down

0 comments on commit 5c861b5

Please sign in to comment.