Update Fedora container to Fedora 32.

This allows unit testing on gcc 10. Also fix an incorrect enum in the config/config unit test that was caught by the new compiler.
pgbackrest · May 7, 2020 · faabf12 · faabf12
1 parent 6646446
commit faabf12
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -31,7 +31,7 @@ jobs:
     - env: PGB_CI="test --vm=co6 --param=build-package --param=module=mock --param=module=real"
 
     # All unit tests (with coverage) on the newest gcc available
-    - env: PGB_CI="test --vm=f30 --param=c-only --param=no-performance"
+    - env: PGB_CI="test --vm=f32 --param=c-only --param=no-performance"
 
     # All integration tests
     - env: PGB_CI="test --vm=u18 --param=build-package --param=module=mock --param=module=real"

diff --git a/test/container.yaml b/test/container.yaml
@@ -12,9 +12,11 @@
 # - docker login -u pgbackrest
 # - VM=XXX;DATE=YYYYMMDDX;BASE=pgbackrest/test:${VM?}-base;docker tag ${BASE?} ${BASE?}-${DATE?} && docker push ${BASE?}-${DATE?}
 # **********************************************************************************************************************************
+20200507A:
+  f32: 61792779061d2a675509c65bfa64b61b8d4cea17
+
 20200505A:
   co6: c07889acc321e461263fada797941cfa947d2550
   co7: 538dc7fd9cc129e44d4ae6bacfb6f1db10309993
-  f30: 3ae2c1749afa24daa1ca31abe9441d5e1e66d892
   u12: 8a88ab44aace049d7da5ca1094375ff8b9aeb7ab
   u18: 0f88948969b70f300a9134482e43cda7b94cb24d
diff --git a/test/lib/pgBackRestTest/Common/ContainerTest.pm b/test/lib/pgBackRestTest/Common/ContainerTest.pm
@@ -492,11 +492,11 @@ sub containerBuild
                         "        https://download.postgresql.org/pub/repos/yum/11/redhat/rhel-7-x86_64/" .
                             "pgdg-redhat-repo-latest.noarch.rpm && \\\n";
                 }
-                elsif ($strOS eq VM_F30)
+                elsif ($strOS eq VM_F32)
                 {
                     $strScript .=
                         "    rpm -ivh \\\n" .
-                        "        https://download.postgresql.org/pub/repos/yum/reporpms/F-30-x86_64/" .
+                        "        https://download.postgresql.org/pub/repos/yum/reporpms/F-32-x86_64/" .
                             "pgdg-fedora-repo-latest.noarch.rpm && \\\n";
                 }
 

diff --git a/test/lib/pgBackRestTest/Common/VmTest.pm b/test/lib/pgBackRestTest/Common/VmTest.pm
@@ -93,8 +93,8 @@ use constant VM_CO6                                                 => 'co6';
     push @EXPORT, qw(VM_CO6);
 use constant VM_CO7                                                 => 'co7';
     push @EXPORT, qw(VM_CO7);
-use constant VM_F30                                                 => 'f30';
-    push @EXPORT, qw(VM_F30);
+use constant VM_F32                                                 => 'f32';
+    push @EXPORT, qw(VM_F32);
 use constant VM_U12                                                 => 'u12';
     push @EXPORT, qw(VM_U12);
 use constant VM_U14                                                 => 'u14';
@@ -212,12 +212,12 @@ my $oyVm =
         ],
     },
 
-    # Fedora 30
-    &VM_F30 =>
+    # Fedora 32
+    &VM_F32 =>
     {
         &VM_OS_BASE => VM_OS_BASE_RHEL,
         &VM_OS => VM_OS_CENTOS,
-        &VM_IMAGE => 'fedora:30',
+        &VM_IMAGE => 'fedora:32',
         &VM_ARCH => VM_ARCH_AMD64,
         &VMDEF_PGSQL_BIN => '/usr/pgsql-{[version]}/bin',
         &VMDEF_COVERAGE_C => true,
@@ -236,7 +236,7 @@ my $oyVm =
 
         &VM_DB_TEST =>
         [
-            PG_VERSION_11,
+            PG_VERSION_12,
         ],
     },
 

diff --git a/test/src/module/config/configTest.c b/test/src/module/config/configTest.c
@@ -256,7 +256,7 @@ testRun(void)
         TEST_RESULT_VOID(cfgCommandSet(cfgCmdBackup, cfgCmdRoleDefault), "backup command");
 
         TEST_ERROR(
-            strPtr(varStr(cfgOptionDefaultValue(cfgOptDbInclude))), AssertError, "default value not available for option type 4");
+            strPtr(varStr(cfgOptionDefaultValue(cfgDefOptDbInclude))), AssertError, "default value not available for option type 4");
         TEST_RESULT_STR_Z(varStr(cfgOptionDefault(cfgOptType)), "incr", "backup type default");
         TEST_RESULT_BOOL(varBool(cfgOptionDefault(cfgOptArchiveAsync)), false, "archive async default");
         TEST_RESULT_DOUBLE(varDbl(cfgOptionDefault(cfgOptProtocolTimeout)), 1830, "backup protocol-timeout default");