From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 222D739FEE for ; Fri, 1 Mar 2024 20:36:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709325372; cv=none; b=Fu/MxQf+T3Xl4qkx++tABkwFXffjerCBIuo6/iFd26DtX3JawfLHakBX9ChTagxjlkEq3hFQl8rcr9zwoFausJ7VVWJUgGPzo4WwEX6Xbv+jTTLTpvvEzAkaNc2vxhvaHZLVmlovqiO0IcnxxK3SUWpXhCFi5i+IKcM9k60Wi5E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709325372; c=relaxed/simple; bh=SraIQbC0WuodEHK3wKD3grtnC075rFs5wxefYcB9/J0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=QWCK+MMrAozUejH1/B5KLAaZoSuXHZGaOFpL0FQKglK8NKSSbMFVFm+oievG1qnIsOj4S/QxSDI9OiCdQU0Y+lspvdde044IPR0LBPsHgESypXs36XnfsSC66UwKsAx1p8yonozsVRQIWbIXzllcF7wAxNPTYR1+wCV/Umam0ok= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SnJ4X9/R; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SnJ4X9/R" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75885C433F1 for ; Fri, 1 Mar 2024 20:36:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709325371; bh=SraIQbC0WuodEHK3wKD3grtnC075rFs5wxefYcB9/J0=; h=From:To:Subject:Date:From; b=SnJ4X9/RQUz77vqZKmav3/9qdYwTTjeYkfNPq2aDUvX/Y9liEWis644wDUELMVHex Pwc8zzJxbwOhdrR18HpCDwHQwOfidItpMmELiLGySDTw0zgrkcBx7JcUq2253OFNsk 8NrPsIHAIwGnmiY1hbYxvnu2ISd7osKrwCaAllIIIkA6lZNq+76fxBy+XYHyX0SGTH uIQEyoKbYzxVPC50chDrm2qrl6/z5+2CcumK6FiDT/vBBPzaguA1GCFCbgpP6p1BT0 q4tGujXPpOa+K25nUMeZZQOYujtsn2J6ZV08olE1NVWbTuTYwqWOfQ+kz9GNu5P9AQ SRcOVFrNkKdvA== From: Jeff Layton To: kdevops@lists.linux.dev Subject: [PATCH] fstests: remove the nfs_default guest Date: Fri, 1 Mar 2024 15:36:10 -0500 Message-ID: <20240301203610.116647-1-jlayton@kernel.org> X-Mailer: git-send-email 2.43.2 Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Chuck recently added an explicit v4.2 guest, which is really the same thing. Remove the redundant nfs_default guest. Signed-off-by: Jeff Layton --- playbooks/roles/fstests/templates/nfs/nfs.config | 5 ----- workflows/fstests/nfs/Kconfig | 10 +--------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/playbooks/roles/fstests/templates/nfs/nfs.config b/playbooks/roles/fstests/templates/nfs/nfs.config index 3b30114cce62..f301075a8928 100644 --- a/playbooks/roles/fstests/templates/nfs/nfs.config +++ b/playbooks/roles/fstests/templates/nfs/nfs.config @@ -10,11 +10,6 @@ SCRATCH_DEV="{{ fstests_nfs_scratch_devpool }}" RESULT_BASE=$PWD/results/$HOST/$(uname -r) TEST_DEV={{ fstests_nfs_test_dev }} CANON_DEVS=yes -{% if fstests_nfs_section_default -%} - -# Test with default mount options -[nfs_default] -{% endif %} {% if fstests_nfs_section_tls -%} # Test NFS with RPC over TLS diff --git a/workflows/fstests/nfs/Kconfig b/workflows/fstests/nfs/Kconfig index 9de5ae04f3a2..f9526b375cf7 100644 --- a/workflows/fstests/nfs/Kconfig +++ b/workflows/fstests/nfs/Kconfig @@ -46,14 +46,6 @@ config FSTESTS_NFS_MANUAL_COVERAGE if FSTESTS_NFS_MANUAL_COVERAGE -config FSTESTS_NFS_SECTION_DEFAULT - bool "Enable testing section: nfs_default" - default y - help - Enabling this will test nfs with the default mount options. At the - time of this writing, this makes the client autonegotiate an NFS - version, starting with v4.2 if it's available. - config FSTESTS_NFS_SECTION_TLS bool "Enable testing section: nfs_tls" default n @@ -63,7 +55,7 @@ config FSTESTS_NFS_SECTION_TLS config FSTESTS_NFS_SECTION_V42 bool "Enable testing section: nfs_v42" - default n + default y help Enabling this will test NFSv4.2. -- 2.43.2