test(NFS): enable NFSv4 tests

In addition make sure that exportfs is available before attempting
to run the tests.

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index aebc1849e343607e6e7eaa1e7d790aa6fa57fcc7..855c611111d180ce7343c86594ca62b40d3d98c8 100644 (file)
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -71,7 +71,7 @@ jobs:
                         #"connman",
                 ]
                 test: [
-                        #"20", # unstable
+                        "20",
                         "30",
                         "35",
                         "40",
@@ -106,6 +106,7 @@ jobs:
                         "network-legacy",
                 ]
                 test: [
+                        "20",
                         "30",
                         "35",
                         "40",

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index cfec348aedceb99ac857e85a9a5db3a2efcdaf09..ec062ccbb14f35cb8e08eac2297c9fa832a88ce8 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -3,6 +3,10 @@
 # shellcheck disable=SC2034
 TEST_DESCRIPTION="root filesystem on NFS with $USE_NETWORK"
 
+test_check() {
+    command -v exportfs &> /dev/null
+}
+
 # Uncomment this to debug failures
 #DEBUGFAIL="rd.debug loglevel=7 rd.break=initqueue rd.shell"
 SERVER_DEBUG="rd.debug loglevel=7"
@@ -213,8 +217,9 @@ test_run() {
         return 1
     fi
 
-    test_nfsv3 \
-        && test_nfsv4
+    # focus on NFSv4 testing, disable NFSv3 tests
+    #test_nfsv3
+    test_nfsv4
 
     ret=$?