From a0980084f0a52b7020429a036a62759466ebecb9 Mon Sep 17 00:00:00 2001 From: Jan Kolarik Date: Fri, 10 May 2024 13:46:52 +0000 Subject: [PATCH] Adjust the container definition to work when the dnf command is dnf5 --- Dockerfile | 12 ++++-------- dnf-behave-tests/requirements.spec | 1 + 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index b5fd0ada7..537177b17 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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; diff --git a/dnf-behave-tests/requirements.spec b/dnf-behave-tests/requirements.spec index e541ddac9..527168db5 100644 --- a/dnf-behave-tests/requirements.spec +++ b/dnf-behave-tests/requirements.spec @@ -27,6 +27,7 @@ BuildRequires: openssl BuildRequires: python3 BuildRequires: python3-distro BuildRequires: python3-pip +BuildRequires: python3-rpm # a missing dep of python3-pip on f35 beta, remove when unneeded BuildRequires: python3-setuptools BuildRequires: python3-toml