[PATCH 1/2] fstests: Run the NFS/RDMA section with NFSv4.1

[PATCH 1/2] fstests: Run the NFS/RDMA section with NFSv4.1

[cel]

From: Chuck Lever <chuck.lever@oracle.com>

Seeing some test hangs here that might be due to known bugs in
NFSv4.2. Force the NFS/RDMA test section to use NFSv4.1, not
the default NFS version (which on modern distros is NFSv4.2).

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 playbooks/roles/fstests/templates/nfs/nfs.config | 4 ++--
 workflows/fstests/nfs/Kconfig                    | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/playbooks/roles/fstests/templates/nfs/nfs.config b/playbooks/roles/fstests/templates/nfs/nfs.config
index 00911af6437a..3605e582b2d7 100644
--- a/playbooks/roles/fstests/templates/nfs/nfs.config
+++ b/playbooks/roles/fstests/templates/nfs/nfs.config
@@ -22,14 +22,14 @@ MOUNT_OPTIONS="-o vers=4.1"
 # Test over RDMA
 [nfs_rdma]
 TEST_FS_MOUNT_OPTS="-o rdma"
-MOUNT_OPTIONS="-o rdma"
+MOUNT_OPTIONS="-o rdma,vers=4.1"
 {% endif %}
 {% if fstests_nfs_section_tls -%}
 
 # Test NFS with RPC over TLS
 [nfs_tls]
 TEST_FS_MOUNT_OPTS="-o xprtsec=mtls"
-MOUNT_OPTIONS="-o xprtsec=mtls"
+MOUNT_OPTIONS="-o xprtsec=mtls,vers=4.1"
 {% endif %}
 {% if fstests_nfs_section_nfsd -%}
 
diff --git a/workflows/fstests/nfs/Kconfig b/workflows/fstests/nfs/Kconfig
index 0b32e710fa58..3c373d7eedfc 100644
--- a/workflows/fstests/nfs/Kconfig
+++ b/workflows/fstests/nfs/Kconfig
@@ -61,6 +61,8 @@ config FSTESTS_NFS_SECTION_RDMA
 	  the target nodes have RDMA hardware already, enable one of
 	  the software RDMA options as well.
 
+	  This test uses an NFSv4.1 mount.
+
 config FSTESTS_NFS_SECTION_TLS
 	bool "Enable testing section: nfs_tls"
 	default n
@@ -68,6 +70,8 @@ config FSTESTS_NFS_SECTION_TLS
 	help
 	  Enabling this will test with the xprtsec=tls mount option.
 
+	  This test uses an NFSv4.1 mount.
+
 config FSTESTS_NFS_SECTION_NFSD
 	bool "Enable testing section: nfsd"
 	output yaml
-- 
2.46.1

[PATCH 2/2] gitr: Update default git version to be cloned

[cel]

From: Chuck Lever <chuck.lever@oracle.com>

A few of the git regression tests that passed on Fedora 39 hosts now
fail on Fedora 40. This seems to have been addressed in git-2.46.0,
the latest stable git version as of this writing.

But the newer unit tests seem to require more disk space than the
meager 5GB currently used as the default.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 playbooks/roles/gitr/tasks/main.yml | 2 +-
 workflows/gitr/Kconfig              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/playbooks/roles/gitr/tasks/main.yml b/playbooks/roles/gitr/tasks/main.yml
index 2eafeaa2f120..faf1fff75ce0 100644
--- a/playbooks/roles/gitr/tasks/main.yml
+++ b/playbooks/roles/gitr/tasks/main.yml
@@ -183,7 +183,7 @@
     export_volname: "{{ gitr_nfs_server_export }}"
     export_options: "{{ nfsd_export_options }}"
     export_fstype: "{{ gitr_nfs_export_fstype }}"
-    export_size: 5g
+    export_size: 10g
     export_pnfs: "{{ (gitr_test_group == 'nfs-pnfs') | bool }}"
   when:
     - gitr_nfs_use_kdevops_nfsd|bool
diff --git a/workflows/gitr/Kconfig b/workflows/gitr/Kconfig
index 05bac614fee3..8de23252208a 100644
--- a/workflows/gitr/Kconfig
+++ b/workflows/gitr/Kconfig
@@ -82,7 +82,7 @@ config GITR_REPO
 
 config GITR_REPO_COMMIT
 	string "The version of git to check out"
-	default "v2.43.0"
+	default "v2.46.0"
 	help
 	  The commit to be used for the test.
 
-- 
2.46.1