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

Adjust the container definition to work when the dnf command is dnf5 #1503

Merged
merged 1 commit into from
May 13, 2024
Merged

Adjust the container definition to work when the dnf command is dnf5 #1503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,12 @@ RUN set -x && \
# Copy extra repo files
COPY ./repos.d/ /etc/yum.repos.d/

# enable the test-utils repo
RUN set -x && \
dnf -y --refresh upgrade; \
dnf -y install dnf-plugins-core; \
dnf -y copr enable rpmsoftwaremanagement/test-utils;

# enable dnf5
RUN set -x && \
dnf -y copr enable rpmsoftwaremanagement/dnf-nightly; \
dnf -y install dnf5-plugins; \
dnf -y --refresh upgrade; \
dnf -y install dnf5 dnf5-plugins; \
dnf5 -y copr enable rpmsoftwaremanagement/test-utils; \
dnf5 -y copr enable rpmsoftwaremanagement/dnf-nightly; \
# run upgrade before distro-sync in case there is a new version in dnf-nightly that has a new dependency
dnf5 -y upgrade; \
dnf5 -y distro-sync --repo copr:copr.fedorainfracloud.org:rpmsoftwaremanagement:dnf-nightly;
Expand Down
1 change: 1 addition & 0 deletions dnf-behave-tests/requirements.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ BuildRequires: openssl
BuildRequires: python3
BuildRequires: python3-distro
BuildRequires: python3-pip
BuildRequires: python3-rpm
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a comment or a note into the commit message why is this needed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't investigate deeply, but I think it should've already been there before, as it is a direct dependency of the CI tests. But it was probably fetched by some dnf4 package instead.

# a missing dep of python3-pip on f35 beta, remove when unneeded
BuildRequires: python3-setuptools
BuildRequires: python3-toml
Expand Down
Loading