From 434938e32b2f71301196f933c3b9a62ed1183c31 Mon Sep 17 00:00:00 2001
From: David Steele <david@pgmasters.net>
Date: Thu, 22 Jun 2023 18:23:06 +0200
Subject: [PATCH] Update Fedora test image to Fedora 38.

This adds testing for the latest tool versions, e.g. gcc.
---
 .github/workflows/test.yml                      |  2 +-
 test/container.yaml                             |  5 ++++-
 test/lib/pgBackRestTest/Common/ContainerTest.pm |  6 +++---
 test/lib/pgBackRestTest/Common/VmTest.pm        | 12 ++++++------
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4e9d7054b..28a658fa5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -47,7 +47,7 @@ jobs:
           - param: test --vm=u22 --param=c-only --param=no-coverage --param=no-back-trace
 
           # All unit tests on the newest gcc available
-          - param: test --vm=f36 --param=c-only --param=no-valgrind --param=no-coverage --param=no-performance
+          - param: test --vm=f38 --param=c-only --param=no-valgrind --param=no-coverage --param=no-performance
 
           # RHEL documentation
           - param: doc --vm=rh8
diff --git a/test/container.yaml b/test/container.yaml
index 8c1b85542..a6c8cecad 100644
--- a/test/container.yaml
+++ b/test/container.yaml
@@ -12,6 +12,10 @@
 # - docker login -u pgbackrest
 # - VM=XXX;DATE=YYYYMMDDX;BASE=pgbackrest/test:${VM?}-base;docker tag ${BASE?} ${BASE?}-${DATE?} && docker push ${BASE?}-${DATE?}
 # **********************************************************************************************************************************
+20230622A:
+  x86_64:
+    f38: 3dc5e099699d3f4f3bc65d06f20c0ae1c9124eaf
+
 20230525A:
   x86_64:
     u22: abc4c03323e07525917eb9d36a9a5a228bce5dcd)
@@ -23,5 +27,4 @@
 20230513A:
   x86_64:
     d10: 633def5323eeed51d7aa187ad1d61e854c47d6fa
-    f36: 640d3ed0d9786ef61263e27a77686a331f72c58e
     rh7: 18dd0cbe19aa66dd9d72d312da5cb8c4bddea8b9
diff --git a/test/lib/pgBackRestTest/Common/ContainerTest.pm b/test/lib/pgBackRestTest/Common/ContainerTest.pm
index 9ec163484..6765c638e 100644
--- a/test/lib/pgBackRestTest/Common/ContainerTest.pm
+++ b/test/lib/pgBackRestTest/Common/ContainerTest.pm
@@ -450,7 +450,7 @@ sub containerBuild
         }
 
         #---------------------------------------------------------------------------------------------------------------------------
-        if ($strOS ne VM_U22 && $strOS ne VM_F36)
+        if ($strOS ne VM_U22)
         {
             my $strValgrind = 'valgrind-3.17.0';
 
@@ -495,11 +495,11 @@ sub containerBuild
                         "        https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-" . hostArch() . "/" .
                             "pgdg-redhat-repo-latest.noarch.rpm && \\\n";
                 }
-                elsif ($strOS eq VM_F36)
+                elsif ($strOS eq VM_F38)
                 {
                     $strScript .=
                         "    rpm -ivh \\\n" .
-                        "        https://download.postgresql.org/pub/repos/yum/reporpms/F-36-" . hostArch() . "/" .
+                        "        https://download.postgresql.org/pub/repos/yum/reporpms/F-38-" . hostArch() . "/" .
                             "pgdg-fedora-repo-latest.noarch.rpm && \\\n";
                 }
 
diff --git a/test/lib/pgBackRestTest/Common/VmTest.pm b/test/lib/pgBackRestTest/Common/VmTest.pm
index 6f25f84fd..5a8af0ca6 100644
--- a/test/lib/pgBackRestTest/Common/VmTest.pm
+++ b/test/lib/pgBackRestTest/Common/VmTest.pm
@@ -82,8 +82,8 @@ use constant VM_RH7                                                 => 'rh7';
     push @EXPORT, qw(VM_RH7);
 use constant VM_RH8                                                 => 'rh8';
     push @EXPORT, qw(VM_RH8);
-use constant VM_F36                                                 => 'f36';
-    push @EXPORT, qw(VM_F36);
+use constant VM_F38                                                 => 'f38';
+    push @EXPORT, qw(VM_F38);
 use constant VM_U20                                                 => 'u20';
     push @EXPORT, qw(VM_U20);
 use constant VM_U22                                                 => 'u22';
@@ -178,8 +178,8 @@ my $oyVm =
         ],
     },
 
-    # Fedora 36
-    &VM_F36 =>
+    # Fedora 38
+    &VM_F38 =>
     {
         &VM_OS_BASE => VM_OS_BASE_RHEL,
         &VM_IMAGE => 'fedora:36',
@@ -192,15 +192,15 @@ my $oyVm =
 
         &VM_DB =>
         [
-            PG_VERSION_11,
             PG_VERSION_12,
             PG_VERSION_13,
             PG_VERSION_14,
+            PG_VERSION_15,
         ],
 
         &VM_DB_TEST =>
         [
-            PG_VERSION_12,
+            PG_VERSION_15,
         ],
     },