From a979fa419d3513bd9222e77b4b91bec03c9021d2 Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Fri, 8 Dec 2023 18:16:34 -0800
Subject: [PATCH] CI: drop Fedora 37, add Fedora 39

This makes 39 the ony to run at all times, and 38 one to run only with fullci.

(cherry picked from commit ee8cc77050e39aea18f2da144dc8108110bb42dc)
---
 .cirrus.yml                            | 14 +++++++-------
 ci/{fedora-37 => fedora-39}/Dockerfile |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename ci/{fedora-37 => fedora-39}/Dockerfile (92%)

diff --git a/.cirrus.yml b/.cirrus.yml
index b508499af6..7005a6ce43 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -156,19 +156,19 @@ env:
 # Linux EOL timelines: https://linuxlifecycle.com/
 # Fedora (~13 months): https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle
 
+fedora39_task:
+  container:
+    # Fedora 39 EOL: Around Nov 2024
+    dockerfile: ci/fedora-39/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
 fedora38_task:
   container:
     # Fedora 38 EOL: Around May 2024
     dockerfile: ci/fedora-38/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
-
-fedora37_task:
-  container:
-    # Fedora 37 EOL: Around Dec 2024
-    dockerfile: ci/fedora-37/Dockerfile
-    << : *RESOURCES_TEMPLATE
-  << : *CI_TEMPLATE
   << : *SKIP_TASK_ON_PR
 
 centosstream9_task:
diff --git a/ci/fedora-37/Dockerfile b/ci/fedora-39/Dockerfile
similarity index 92%
rename from ci/fedora-37/Dockerfile
rename to ci/fedora-39/Dockerfile
index 43335ff770..3b9177415a 100644
--- a/ci/fedora-37/Dockerfile
+++ b/ci/fedora-39/Dockerfile
@@ -1,8 +1,8 @@
-FROM fedora:37
+FROM fedora:39
 
 # A version field to invalidate Cirrus's build cache when needed, as suggested in
 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20230816
+ENV DOCKERFILE_VERSION 20231208
 
 RUN dnf -y install \
     bison \