From eb3e6c55b1a05effca634e817625af92dd7a6ebe Mon Sep 17 00:00:00 2001
From: Nicola Sella <nsella@redhat.com>
Date: Tue, 23 Jan 2024 15:43:42 +0100
Subject: [PATCH] Switch CI to Fedora 39

---
 Dockerfile                                          | 2 +-
 Dockerfile.ansible                                  | 2 +-
 dnf-behave-tests/dnf/plugins-third/swidtags.feature | 2 +-
 dnf-behave-tests/requirements.spec                  | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3b7b5b572..59aee4b43 100644
--- 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
index 452912998..85b451942 100644
--- 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
index 9dc8b562f..3069a6cd7 100644
--- 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
index 8a427eec8..8687cf48f 100644
--- 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