Merge branch 'integration' into dws-a324-ci

# Conflicts:
#	.github/workflows/test.yml
#	test/container.yaml
#	test/lib/pgBackRestTest/Common/VmTest.pm

Author: dwsteele

.github/workflows/test.yml

@@ -50,10 +50,10 @@ jobs:
           # All unit tests on the newest gcc available
           - param: test --vm=f44 --param=c-only --param=no-valgrind --param=no-coverage --param=no-performance
 
-          # All unit and integration tests on musl libc
+          # All unit and integration tests on musl libc (oldest Alpine)
           - param: test --vm=a321 --param=no-coverage --param=no-performance
 
-          # All unit tests on musl libc
+          # All unit and integration tests on musl libc (newest Alpine)
           - param: test --vm=a324 --param=no-coverage --param=no-performance
 
           # RHEL documentation

test/lib/pgBackRestTest/Common/ContainerTest.pm

@@ -604,7 +604,7 @@ sub containerBuild
                 "    echo '***********************************************' >> /etc/issue.net && \\\n" .
                 "    echo 'Banner /etc/issue.net'                           >> /etc/ssh/sshd_config";
 
-            if ($strOS eq VM_U22)
+            if ($strOS eq VM_U22 || $strOS eq VM_A321)
             {
                 $strScript .= sectionHeader() .
                     "    echo '# Add PubkeyAcceptedAlgorithms (required for SFTP)'              >> /etc/ssh/sshd_config && \\\n" .

test/src/valgrind.suppress.none

@@ -12,3 +12,17 @@
     fun:_Unwind_Backtrace
     fun:backtrace_full
 }
+{
+    libssh2_session_handshake
+    Memcheck:Leak
+    match-leak-kinds: possible
+    ...
+    fun:libssh2_session_handshake
+}
+{
+    libssh2_session_init_ex
+    Memcheck:Leak
+    match-leak-kinds: possible
+    ...
+    fun:libssh2_session_init_ex
+}