From a80d8799c22501f2e9385b56bd0287059e8750a1 Mon Sep 17 00:00:00 2001
From: Scott Mayhew <smayhew@redhat.com>
Date: Tue, 12 Nov 2024 17:54:46 -0500
Subject: [PATCH] Fix the functional gating test

When the test is run in OSCI, all the packages from the build are
installed - not just nfs-utils.  The nfsv4-client-utils package installs
/etc/nfsmount.conf.d/10-nfsv4.conf config snippet, which we need to
disable before we do the version negotiation test or it will fail.

Resolves: RHEL-65829
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
 nfs-utils.spec           | 5 ++++-
 tests/scripts/runtest.sh | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 1f065cf..4e9b284 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Name: nfs-utils
 URL: http://linux-nfs.org/
 Version: 2.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -429,6 +429,9 @@ rm -rf /etc/systemd/system/rpc-*.requires
 %{_mandir}/*/nfsiostat.8.gz
 
 %changelog
+* Tue Nov 12 2024 Scott Mayhew <smayhew@redhat.com> - 2.7.1-3
+- Fix the functional gating test (RHEL-65829)
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:2.7.1-2
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018
diff --git a/tests/scripts/runtest.sh b/tests/scripts/runtest.sh
index b7db130..fb7e02b 100644
--- a/tests/scripts/runtest.sh
+++ b/tests/scripts/runtest.sh
@@ -46,6 +46,9 @@ done
 
 echo "Check nfs negotiation"
 echo -e "[nfsd]\n vers3=y\n vers4=n" > /etc/nfs.conf
+if [ -f /etc/nfsmount.conf.d/10-nfsv4.conf ]; then
+	mv /etc/nfsmount.conf.d/10-nfsv4.conf /etc/nfsmount.conf.d/10-nfsv4.conf.disabled
+fi
 systemctl restart nfs-server
 showmount -e | grep -q export_test
 [ $? -ne 0 ] && echo "Failed to export nfs" && exit 1
@@ -69,5 +72,8 @@ systemctl stop nfs-server
 cp /etc/nfs.conf.bak /etc/nfs.conf
 cp /etc/exports.bak /etc/exports
 rm -rf /export_test /mnt_test
+if [ -f /etc/nfsmount.conf.d/10-nfsv4.conf.disabled ]; then
+	mv /etc/nfsmount.conf.d/10-nfsv4.conf.disabled /etc/nfsmount.conf.d/10-nfsv4.conf
+fi
 
 exit 0