Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dnf5-unstable repo and use dnf5 once it's available #1407

Merged
merged 2 commits into from
Dec 11, 2023
Merged

Remove dnf5-unstable repo and use dnf5 once it's available #1407

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9877c61
Remove dnf5-unstable repo
inknos Nov 14, 2023
389689c
Use dnf5 once it gets installed
inknos Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,31 @@ RUN set -x && \

# enable dnf5
RUN set -x && \
dnf -y copr enable rpmsoftwaremanagement/dnf5-unstable; \
# enable dnf-nightly as well to get librepo and libsolv
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:dnf5-unstable;
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
Loading