Switch CI to Fedora 39

rpm-software-management · Jan 23, 2024 · eb3e6c5 · eb3e6c5
1 parent cca38be
commit eb3e6c5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 # $ podman build --build-arg TYPE=distro -t ci-dnf-stack -f Dockerfile
 # $ podman run --net none -it ci-dnf-stack behave dnf
 
-ARG BASE=fedora:38
+ARG BASE=fedora:39
 FROM $BASE
 
 ENV LANG C.UTF-8

diff --git a/Dockerfile.ansible b/Dockerfile.ansible
@@ -2,7 +2,7 @@
 # $ podman build --build-arg TYPE=distro -t ansible -f Dockerfile.ansible
 # $ podman run --net none -it ansible ./ansible
 
-FROM fedora:38
+FROM fedora:39
 ARG TYPE=nightly
 
 # enable nightlies if requested

diff --git a/dnf-behave-tests/dnf/plugins-third/swidtags.feature b/dnf-behave-tests/dnf/plugins-third/swidtags.feature
@@ -1,5 +1,5 @@
 # the swidtags plugin is available only in Fedora
-@use.with_os=fedora__ge__30
+@use.with_os=fedora__le__38
 Feature: Smoke test for swidtags dnf plugin
 
 

diff --git a/dnf-behave-tests/requirements.spec b/dnf-behave-tests/requirements.spec
@@ -57,8 +57,10 @@ BuildRequires:  python3-dnf-plugin-show-leaves
 
 %if 0%{?fedora}
 BuildRequires:  python3-dnf-plugin-system-upgrade
+%if 0%{?fedora} < 39
 BuildRequires:  dnf-plugin-swidtags
 %endif
+%endif
 
 BuildRequires:  microdnf