From: Luis Chamberlain <mcgrof@kernel.org>
To: kdevops@lists.linux.dev, chuck.lever@oracle.com,
da.gomez@samsung.com, jlayton@kernel.org
Cc: mcgrof@kernel.org
Subject: [PATCH 4/5] workflows/Makefile: replace direct named entries with output yaml
Date: Wed, 4 Sep 2024 16:30:39 -0700 [thread overview]
Message-ID: <20240904233040.1516250-5-mcgrof@kernel.org> (raw)
In-Reply-To: <20240904233040.1516250-1-mcgrof@kernel.org>
There are workflow variables which have an exact respective ansible
variable, just use the new "output yaml" so we can aggregate these
automatically directly from kconfig.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
kconfigs/workflows/Kconfig | 8 ++++++++
workflows/Makefile | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/kconfigs/workflows/Kconfig b/kconfigs/workflows/Kconfig
index 28262741e792..6530ce3cf50e 100644
--- a/kconfigs/workflows/Kconfig
+++ b/kconfigs/workflows/Kconfig
@@ -260,6 +260,7 @@ endif # !WORKFLOWS_DEDICATED_WORKFLOW
config KDEVOPS_WORKFLOW_ENABLE_FSTESTS
bool
+ output yaml
default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_FSTESTS || KDEVOPS_WORKFLOW_DEDICATE_FSTESTS
if KDEVOPS_WORKFLOW_ENABLE_FSTESTS
@@ -270,6 +271,7 @@ endif # KDEVOPS_WORKFLOW_ENABLE_FSTESTS
config KDEVOPS_WORKFLOW_ENABLE_BLKTESTS
bool
+ output yaml
default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_BLKTESTS || KDEVOPS_WORKFLOW_DEDICATE_BLKTESTS
if KDEVOPS_WORKFLOW_ENABLE_BLKTESTS
@@ -280,6 +282,7 @@ endif # KDEVOPS_WORKFLOW_ENABLE_BLKTESTS
config KDEVOPS_WORKFLOW_ENABLE_CXL
bool
+ output yaml
default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_CXL || KDEVOPS_WORKFLOW_DEDICATE_CXL
if KDEVOPS_WORKFLOW_ENABLE_CXL
@@ -290,6 +293,7 @@ endif # KDEVOPS_WORKFLOW_ENABLE_CXL
config KDEVOPS_WORKFLOW_ENABLE_PYNFS
bool
+ output yaml
default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_PYNFS || KDEVOPS_WORKFLOW_DEDICATE_PYNFS
select KDEVOPS_SETUP_NFSD
@@ -301,6 +305,7 @@ endif # KDEVOPS_WORKFLOW_ENABLE_PYNFS
config KDEVOPS_WORKFLOW_ENABLE_SELFTESTS
bool
+ output yaml
default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_SELFTESTS || KDEVOPS_WORKFLOW_DEDICATE_SELFTESTS
if KDEVOPS_WORKFLOW_ENABLE_SELFTESTS
@@ -311,6 +316,7 @@ endif # KDEVOPS_WORKFLOW_ENABLE_SELFTESTS
config KDEVOPS_WORKFLOW_ENABLE_GITR
bool
+ output yaml
default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_GITR || KDEVOPS_WORKFLOW_DEDICATE_GITR
if KDEVOPS_WORKFLOW_ENABLE_GITR
@@ -321,6 +327,7 @@ endif # KDEVOPS_WORKFLOW_ENABLE_GITR
config KDEVOPS_WORKFLOW_ENABLE_LTP
bool
+ output yaml
default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_LTP || KDEVOPS_WORKFLOW_DEDICATE_LTP
if KDEVOPS_WORKFLOW_ENABLE_LTP
@@ -331,6 +338,7 @@ endif # KDEVOPS_WORKFLOW_ENABLE_GITR
config KDEVOPS_WORKFLOW_ENABLE_NFSTEST
bool
+ output yaml
default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_NFSTEST || KDEVOPS_WORKFLOW_DEDICATE_NFSTEST
if KDEVOPS_WORKFLOW_ENABLE_NFSTEST
diff --git a/workflows/Makefile b/workflows/Makefile
index e305f2629abf..34afb9af3f9b 100644
--- a/workflows/Makefile
+++ b/workflows/Makefile
@@ -15,27 +15,22 @@ WORKFLOW_ARGS += kdevops_bootlinux='False'
endif
ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_FSTESTS))
-WORKFLOW_ARGS += kdevops_workflow_enable_fstests='True'
include workflows/fstests/Makefile
endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_FSTESTS == y
ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_BLKTESTS))
-WORKFLOW_ARGS += kdevops_workflow_enable_blktests='True'
include workflows/blktests/Makefile
endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_BLKTESTS == y
ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_CXL))
-WORKFLOW_ARGS += kdevops_workflow_enable_cxl='True'
include workflows/cxl/Makefile
endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_CXL == y
ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_PYNFS))
-WORKFLOW_ARGS += kdevops_workflow_enable_pynfs='True'
include workflows/pynfs/Makefile
endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_PYNFS == y
ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_SELFTESTS))
-WORKFLOW_ARGS += kdevops_workflow_enable_selftests='True'
include workflows/selftests/Makefile
endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_SELFTESTS
@@ -44,17 +39,14 @@ include workflows/demos/reboot-limit/Makefile
endif # CONFIG_WORKFLOWS_REBOOT_LIMIT == y
ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_GITR))
-WORKFLOW_ARGS += kdevops_workflow_enable_gitr='True'
include workflows/gitr/Makefile
endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_GITR == y
ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_LTP))
-WORKFLOW_ARGS += kdevops_workflow_enable_ltp='True'
include workflows/ltp/Makefile
endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_LTP == y
ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_NFSTEST))
-WORKFLOW_ARGS += kdevops_workflow_enable_nfstest='True'
include workflows/nfstest/Makefile
endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_NFSTEST == y
--
2.43.0
next prev parent reply other threads:[~2024-09-04 23:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-04 23:30 [PATCH 0/5] kdevops: embrace kconfig selective yaml output Luis Chamberlain
2024-09-04 23:30 ` [PATCH 1/5] Makefile: add support for selective yamlconfig Luis Chamberlain
2024-09-04 23:30 ` [PATCH 2/5] scripts/guestfs.Makefile: use output yaml for GUESTFS_REQUIRES_UEFI Luis Chamberlain
2024-09-04 23:30 ` [PATCH 3/5] scripts/ssh.Makefile: remove Makefile appending of KDEVOPS_HOSTS_PREFIX Luis Chamberlain
2024-09-04 23:30 ` Luis Chamberlain [this message]
2024-09-04 23:30 ` [PATCH 5/5] fstests: use selective yaml output on a slew of different variables Luis Chamberlain
2024-09-05 8:03 ` [PATCH 0/5] kdevops: embrace kconfig selective yaml output Luis Chamberlain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240904233040.1516250-5-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=da.gomez@samsung.com \
--cc=jlayton@kernel.org \
--cc=kdevops@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox