From a7723eb017c618611da37531e5961632d9ae03b0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 15 Jun 2023 22:19:02 -0500
Subject: [PATCH] Fedora support time for 37 and 38.

---
 .github/workflows/ci.yml              |  4 +---
 meta/main.yml                         |  6 ++----
 vars/Fedora-29.yml                    | 12 ------------
 vars/Fedora-30.yml                    | 13 -------------
 vars/{Fedora-32.yml => Fedora-37.yml} |  2 +-
 vars/{Fedora-31.yml => Fedora-38.yml} |  4 ++--
 6 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 vars/Fedora-29.yml
 delete mode 100644 vars/Fedora-30.yml
 rename vars/{Fedora-32.yml => Fedora-37.yml} (93%)
 rename vars/{Fedora-31.yml => Fedora-38.yml} (81%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0915f62..3a999e2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,11 +44,9 @@ jobs:
         distro:
           - rockylinux8
           - rockylinux9
-          - fedora36
+          - fedora38
           - ubuntu2204
           - ubuntu2004
-          - ubuntu1804
-          - debian10
           - debian11
           - debian12
 
diff --git a/meta/main.yml b/meta/main.yml
index 4ba7b1e..9b9d7e8 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -19,13 +19,11 @@ galaxy_info:
         - 9
     - name: Fedora
       versions:
-        - 30
-        - 31
-        - 32
-        - 33
         - 34
         - 35
         - 36
+        - 37
+        - 38
     - name: Ubuntu
       versions:
         - xenial
diff --git a/vars/Fedora-29.yml b/vars/Fedora-29.yml
deleted file mode 100644
index 4e09932..0000000
--- a/vars/Fedora-29.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-__postgresql_version: "10.5"
-__postgresql_data_dir: "/var/lib/pgsql/data"
-__postgresql_bin_path: "/usr/bin"
-__postgresql_config_path: "/var/lib/pgsql/data"
-__postgresql_daemon: postgresql
-__postgresql_packages:
-  - postgresql
-  - postgresql-server
-  - postgresql-contrib
-  - postgresql-libs
-postgresql_python_library: python2-psycopg2
diff --git a/vars/Fedora-30.yml b/vars/Fedora-30.yml
deleted file mode 100644
index d07f14b..0000000
--- a/vars/Fedora-30.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-__postgresql_version: "11.2"
-__postgresql_data_dir: "/var/lib/pgsql/data"
-__postgresql_bin_path: "/usr/bin"
-__postgresql_config_path: "/var/lib/pgsql/data"
-__postgresql_daemon: postgresql
-__postgresql_packages:
-  - postgresql
-  - postgresql-server
-  - postgresql-contrib
-  - postgresql-libs
-# Fedora 30 containers only have python3 by default
-postgresql_python_library: python3-psycopg2
diff --git a/vars/Fedora-32.yml b/vars/Fedora-37.yml
similarity index 93%
rename from vars/Fedora-32.yml
rename to vars/Fedora-37.yml
index 6ce9d9b..6659342 100644
--- a/vars/Fedora-32.yml
+++ b/vars/Fedora-37.yml
@@ -1,5 +1,5 @@
 ---
-__postgresql_version: "12.2"
+__postgresql_version: "14.3"
 __postgresql_data_dir: "/var/lib/pgsql/data"
 __postgresql_bin_path: "/usr/bin"
 __postgresql_config_path: "/var/lib/pgsql/data"
diff --git a/vars/Fedora-31.yml b/vars/Fedora-38.yml
similarity index 81%
rename from vars/Fedora-31.yml
rename to vars/Fedora-38.yml
index 27a023e..e0851d6 100644
--- a/vars/Fedora-31.yml
+++ b/vars/Fedora-38.yml
@@ -1,5 +1,5 @@
 ---
-__postgresql_version: "11.5"
+__postgresql_version: "15.1"
 __postgresql_data_dir: "/var/lib/pgsql/data"
 __postgresql_bin_path: "/usr/bin"
 __postgresql_config_path: "/var/lib/pgsql/data"
@@ -10,5 +10,5 @@ __postgresql_packages:
   - postgresql-contrib
   - postgresql-libs
 __postgresql_unix_socket_directories_mode: '0755'
-# Fedora 31 containers only have python3 by default
+# Fedora 32 containers only have python3 by default
 postgresql_python_library: python3-psycopg2