[PATCH 5/5] fstests: use selective yaml output on a slew of different variables

[Luis Chamberlain <mcgrof@kernel.org>]

These are the first set of obvious candidate variables which we can
convert over to just using the selective yaml output so we don't have
to do the Makefile variable conversion ourselves.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 workflows/fstests/Kconfig  | 11 +++++++++
 workflows/fstests/Makefile | 46 --------------------------------------
 2 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/workflows/fstests/Kconfig b/workflows/fstests/Kconfig
index 8f09f8f3bec9..0e7e5d5787a3 100644
--- a/workflows/fstests/Kconfig
+++ b/workflows/fstests/Kconfig
@@ -35,12 +35,15 @@ config FSTESTS_CIFS_ENABLE
 
 config FSTESTS_USES_NO_DEVICES
 	bool
+	output yaml
 
 config FSTESTS_GENERATE_SIMPLE_CONFIG_ENABLE
 	bool
+	output yaml
 
 config FSTESTS_GENERATE_NVME_LIVE_CONFIG_ENABLE
 	bool
+	output yaml
 
 choice
 	prompt "Target filesystem to test"
@@ -305,6 +308,7 @@ config HAVE_MIRROR_KDEVOPS_FSTESTS
 
 config FSTESTS_GIT
 	string "The fstests git tree to clone"
+	output yaml
 	default DEFAULT_FSTESTS_HTTPS_URL if !GIT_ALTERNATIVES && !HAVE_MIRROR_FSTESTS
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/fstests.git) if !GIT_ALTERNATIVES && HAVE_MIRROR_FSTESTS && VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/fstests.git) if !GIT_ALTERNATIVES && HAVE_MIRROR_FSTESTS && GUESTFS
@@ -318,6 +322,7 @@ config FSTESTS_GIT
 
 config FSTESTS_DATA
 	string "Where to clone the fstests git tree to"
+	output yaml
 	default "{{data_path}}/fstests"
 	help
 	  This is the target location of where to clone the above git tree.
@@ -326,12 +331,14 @@ config FSTESTS_DATA
 
 config FSTESTS_GIT_VERSION
 	string "The fstests git tree version(branch/tag/commit)"
+	output yaml
 	default "HEAD"
 	help
 	  The fstests git tree version.
 
 config FSTESTS_DATA_TARGET
 	string "The target fstests install directory"
+	output yaml
 	default "/var/lib/xfstests"
 	help
 	  The directory where fstests will be installed. Modifying this probably
@@ -404,6 +411,7 @@ config FSTESTS_TESTDEV_SPARSEFILE_GENERATION
 
 config FSTESTS_TESTDEV_NVME_PARTITION_EUIS
 	bool "Use first real NVMe drive and create partitions"
+	output yaml
 	select EXTRA_STORAGE_SUPPORTS_512
 	select EXTRA_STORAGE_SUPPORTS_1K
 	select EXTRA_STORAGE_SUPPORTS_2K
@@ -493,6 +501,7 @@ endif # FSTESTS_TMPFS
 
 config FSTESTS_TESTDEV_NVME_FALLBACK_MODEL_SERIAL
 	bool "Fallback to using NVMe model an serial"
+	output yaml
 	depends on FSTESTS_TESTDEV_NVME_PARTITION_EUIS || FSTESTS_TESTDEV_NVME_EUIS
 	default y
 	help
@@ -626,6 +635,7 @@ config FSTESTS_TEST_DEV_ZNS
 
 config FSTESTS_TEST_DIR
 	string "The path to use for the fstests TEST_DIR variable"
+	output yaml
 	default "/media/test"
 	help
 	  To test with fstests one must set the TEST_DEV variable, this sets
@@ -648,6 +658,7 @@ config FSTESTS_SCRATCH_DEV_POOL_ZNS
 
 config FSTESTS_SCRATCH_MNT
 	string "The path to use for the fstests SCRATCH_MNT variable"
+	output yaml
 	default "/media/scratch"
 	help
 	  This sets the SCRATCH_MNT variable.
diff --git a/workflows/fstests/Makefile b/workflows/fstests/Makefile
index bc57b3190ab0..f58d2771fe94 100644
--- a/workflows/fstests/Makefile
+++ b/workflows/fstests/Makefile
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: copyleft-next-0.3.1
 
-FSTESTS=$(subst ",,$(CONFIG_FSTESTS_DATA_TARGET))
-FSTESTS_SETUP_SYSTEM=$(subst ",,$(CONFIG_FSTESTS_SETUP_SYSTEM))
-FSTESTS_TEST_DEV=$(subst ",,$(CONFIG_FSTESTS_TEST_DEV))
-
 FSTESTS_ARGS	        :=
 FSTESTS_ARGS_SEPARATED	:=
 FSTESTS_ARGS_DIRECT :=
@@ -16,36 +12,14 @@ ifeq (y,$(CONFIG_WORKFLOWS_DEDICATED_WORKFLOW))
 export KDEVOPS_HOSTS_TEMPLATE := fstests.j2
 endif
 
-FSTESTS_GIT:=$(subst ",,$(CONFIG_FSTESTS_GIT))
-FSTESTS_DATA:=$(subst ",,$(CONFIG_FSTESTS_DATA))
-FSTESTS_GIT_VERSION:=$(subst ",,$(CONFIG_FSTESTS_GIT_VERSION))
-FSTESTS_DATA_TARGET:=$(subst ",,$(CONFIG_FSTESTS_DATA_TARGET))
-
-FSTESTS_ARGS += fstests_git=$(FSTESTS_GIT)
-FSTESTS_ARGS += fstests_git_version=$(FSTESTS_GIT_VERSION)
 FSTESTS_ARGS += fstests_fstyp='$(FSTYP)'
 FS_CONFIG='$(FSTYP)/$(FSTYP).config'
 FSTESTS_ARGS += fs_config_role_path='roles/fstests/templates/$(FS_CONFIG)'
-FSTESTS_ARGS += fstests_data=\"$(FSTESTS_DATA)\"
-FSTESTS_ARGS += fstests_setup_system='$(FSTESTS_SETUP_SYSTEM)'
-FSTESTS_ARGS += fstests_data_target='$(FSTESTS_DATA_TARGET)'
 
 ifeq (y,$(CONFIG_FSTESTS_TFB_COPY_ENABLE))
 FSTESTS_ARGS += fstests_tfp_copy_enable='True'
 endif
 
-ifeq (y,$(CONFIG_FSTESTS_USES_NO_DEVICES))
-FSTESTS_ARGS += fstests_uses_no_devices='True'
-endif
-
-ifeq (y,$(CONFIG_FSTESTS_GENERATE_SIMPLE_CONFIG_ENABLE))
-FSTESTS_ARGS += fstests_generate_simple_config_enable='True'
-endif
-
-ifeq (y,$(CONFIG_FSTESTS_GENERATE_NVME_LIVE_CONFIG_ENABLE))
-FSTESTS_ARGS += fstests_generate_nvme_live_config_enable='True'
-endif
-
 ifeq (y,$(CONFIG_FSTESTS_XFS))
 include $(TOPDIR)/workflows/fstests/Makefile.xfs
 endif
@@ -78,26 +52,6 @@ export FSTESTS_SPARSE_FILENAME_PREFIX:=
 export FSTESTS_SCRATCH_MNT:=
 export FSTESTS_LOGWRITES_DEV:=
 
-FSTESTS_TEST_DIR:=$(subst ",,$(CONFIG_FSTESTS_TEST_DIR))
-FSTESTS_ARGS += fstests_test_dir='$(FSTESTS_TEST_DIR)'
-
-FSTESTS_SCRATCH_MNT:=$(subst ",,$(CONFIG_FSTESTS_SCRATCH_MNT))
-FSTESTS_ARGS += fstests_scratch_mnt='$(FSTESTS_SCRATCH_MNT)'
-
-# Only 1 real NVMe drive is required use PCIe passthrough with make dynconfig
-ifeq (y,$(CONFIG_FSTESTS_TESTDEV_NVME_PARTITION_EUIS))
-FSTESTS_ARGS += fstests_testdev_nvme_partition_euis='True'
-endif
-
-# 7 drives are needed, use PCIe passthrough onto the guest with make dynconfig
-ifeq (y,$(CONFIG_FSTESTS_TESTDEV_NVME_EUIS))
-FSTESTS_ARGS += fstests_testdev_nvme_euis='True'
-endif
-
-ifeq (y,$(CONFIG_FSTESTS_TESTDEV_NVME_FALLBACK_MODEL_SERIAL))
-FSTESTS_ARGS += fstests_testdev_nvme_fallback_model_serial='True'
-endif
-
 ifeq (y,$(CONFIG_CONFIG_BOOTLINUX))
 TREE_REF:=$(subst ",,$(CONFIG_BOOTLINUX_TREE_REF))
 FSTESTS_ARGS += fstests_perf_config='$(PROJECTRELEASE)-kernel-$(TREE_REF)'
-- 
2.43.0