Skip to content

Commit

Permalink
Use dnf5 once it gets installed
Browse files Browse the repository at this point in the history
  • Loading branch information
inknos committed Dec 5, 2023
1 parent 9877c61 commit 389689c
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,28 @@ RUN set -x && \
dnf -y copr enable rpmsoftwaremanagement/dnf-nightly; \
dnf -y install dnf5-plugins; \
# run upgrade before distro-sync in case there is a new version in dnf-nightly that has a new dependency
dnf -y upgrade; \
dnf -y distro-sync --repo copr:copr.fedorainfracloud.org:rpmsoftwaremanagement:dnf-nightly;
dnf5 -y upgrade; \
dnf5 -y distro-sync --repo copr:copr.fedorainfracloud.org:rpmsoftwaremanagement:dnf-nightly;

RUN set -x && \
if [ -n "$COPR" ] && [ -n "$COPR_RPMS" ]; then \
dnf -y copr enable $COPR; \
dnf -y install $COPR_RPMS; \
dnf5 -y copr enable $COPR; \
dnf5 -y install $COPR_RPMS; \
fi

# copy test suite
COPY ./dnf-behave-tests/ /opt/ci/dnf-behave-tests

# install test suite dependencies
RUN set -x && \
dnf -y builddep /opt/ci/dnf-behave-tests/requirements.spec && \
dnf5 -y builddep /opt/ci/dnf-behave-tests/requirements.spec && \
pip3 install -r /opt/ci/dnf-behave-tests/requirements.txt

# install local RPMs if available
COPY ./rpms/ /opt/ci/rpms/
RUN rm /opt/ci/rpms/*-{devel,debuginfo,debugsource}*.rpm; \
if [ -n "$(find /opt/ci/rpms/ -maxdepth 1 -name '*.rpm' -print -quit)" ]; then \
dnf -y install /opt/ci/rpms/*.rpm --disableplugin=local; \
dnf5 -y install /opt/ci/rpms/*.rpm --disableplugin=local; \
fi

# create directory for dbus daemon socket
Expand Down

0 comments on commit 389689c

Please sign in to comment.