From: cel@kernel.org
To: <kdevops@lists.linux.dev>
Cc: Chuck Lever <chuck.lever@oracle.com>,
Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH 2/2] Makefile: Remove "-f 30" command line argument
Date: Thu, 17 Apr 2025 13:21:19 -0400 [thread overview]
Message-ID: <20250417172119.3190398-2-cel@kernel.org> (raw)
In-Reply-To: <20250417172119.3190398-1-cel@kernel.org>
From: Chuck Lever <chuck.lever@oracle.com>
We can now set the maximum forks globally in ansible.cfg, and it
can be adjusted with Kconfig or cli. Remove explicit fork settings
from Makefiles.
Suggested-by: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
scripts/firstconfig.Makefile | 3 +--
scripts/iscsi.Makefile | 6 +++--
scripts/journal-server.Makefile | 12 ++++------
scripts/kotd.Makefile | 9 ++++---
scripts/krb5.Makefile | 12 ++++++----
scripts/ktls.Makefile | 6 +++--
scripts/nfsd.Makefile | 6 +++--
scripts/rdma.Makefile | 12 ++++++----
scripts/smbd.Makefile | 6 +++--
scripts/systemd-timesync.Makefile | 3 +--
scripts/update_etc_hosts.Makefile | 2 +-
workflows/blktests/Makefile | 34 +++++++++++++++++++++------
workflows/common/Makefile | 3 ++-
workflows/cxl/Makefile | 14 +++++------
workflows/demos/reboot-limit/Makefile | 25 +++++++++++++-------
workflows/fstests/Makefile | 23 +++++++++---------
workflows/gitr/Makefile | 22 ++++++++++-------
workflows/ltp/Makefile | 23 +++++++++++-------
workflows/nfstest/Makefile | 22 ++++++++++-------
workflows/pynfs/Makefile | 31 ++++++++++++++++++------
workflows/selftests/Makefile | 8 +++----
21 files changed, 180 insertions(+), 102 deletions(-)
diff --git a/scripts/firstconfig.Makefile b/scripts/firstconfig.Makefile
index 808975027ef4..f1a4423e6d96 100644
--- a/scripts/firstconfig.Makefile
+++ b/scripts/firstconfig.Makefile
@@ -2,8 +2,7 @@
firstconfig:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
- -f 30 -i hosts \
- --extra-vars '{ kdevops_cli_install: True }' \
+ -i hosts --extra-vars '{ kdevops_cli_install: True }' \
--tags vars_simple,firstconfig \
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
diff --git a/scripts/iscsi.Makefile b/scripts/iscsi.Makefile
index 893183721dfc..d9ac22befa02 100644
--- a/scripts/iscsi.Makefile
+++ b/scripts/iscsi.Makefile
@@ -6,8 +6,10 @@ ISCSI_EXTRA_ARGS += kdevops_enable_iscsi=true
ANSIBLE_EXTRA_ARGS += $(ISCSI_EXTRA_ARGS)
iscsi:
- $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
- -f 30 -i hosts -l iscsi playbooks/iscsi.yml
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+ -i $(KDEVOPS_HOSTFILE) -l iscsi \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/iscsi.yml
KDEVOPS_BRING_UP_DEPS += iscsi
diff --git a/scripts/journal-server.Makefile b/scripts/journal-server.Makefile
index 493c768b6321..da61fa302698 100644
--- a/scripts/journal-server.Makefile
+++ b/scripts/journal-server.Makefile
@@ -12,8 +12,7 @@ endif
journal-client:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
- -f 30 -i hosts \
- --extra-vars '{ kdevops_cli_install: True }' \
+ -i hosts --extra-vars '{ kdevops_cli_install: True }' \
--tags vars_simple,journal \
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
@@ -24,14 +23,12 @@ journal-server:
journal-restart:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
- -f 30 -i hosts \
- --tags vars_extra,journal-upload-restart \
+ -i hosts --tags vars_extra,journal-upload-restart \
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
journal-status:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
- -f 30 -i hosts \
- --tags vars_extra,journal-status \
+ -i hosts --tags vars_extra,journal-status \
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
journal-ls:
@@ -43,8 +40,7 @@ journal-dump:
journal-ln:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
- -f 30 -i hosts \
- --tags vars_extra,journal_ln \
+ -i hosts --tags vars_extra,journal_ln \
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
LOCALHOST_SETUP_WORK += journal-server
diff --git a/scripts/kotd.Makefile b/scripts/kotd.Makefile
index e5c266a26572..b9b7cf650612 100644
--- a/scripts/kotd.Makefile
+++ b/scripts/kotd.Makefile
@@ -11,15 +11,18 @@ ANSIBLE_CMD_KOTD_ENABLE :=
kotd: $(KDEVOPS_HOSTS) .config
$(Q)$(ANSIBLE_CMD_KOTD_ENABLE)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts playbooks/devconfig.yml --tags vars,kotd --extra-vars=@./extra_vars.yaml
+ -i hosts playbooks/devconfig.yml --tags vars,kotd \
+ --extra-vars=@./extra_vars.yaml
kotd-baseline: $(KDEVOPS_HOSTS) .config
$(Q)$(ANSIBLE_CMD_KOTD_ENABLE)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/devconfig.yml --tags vars,kotd --extra-vars=@./extra_vars.yaml
+ -i hosts -l baseline playbooks/devconfig.yml --tags vars,kotd \
+ --extra-vars=@./extra_vars.yaml
kotd-dev: $(KDEVOPS_HOSTS) .config
$(Q)$(ANSIBLE_CMD_KOTD_ENABLE)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/devconfig.yml --tags vars,kotd --extra-vars=@./extra_vars.yaml
+ -i hosts -l dev playbooks/devconfig.yml --tags vars,kotd \
+ --extra-vars=@./extra_vars.yaml
kotd-help-menu:
@echo "kotd options:"
diff --git a/scripts/krb5.Makefile b/scripts/krb5.Makefile
index 14f73d8c68c1..d49e77ba02a8 100644
--- a/scripts/krb5.Makefile
+++ b/scripts/krb5.Makefile
@@ -7,12 +7,16 @@ KRB5_EXTRA_ARGS += kdevops_krb5_enable=True
ANSIBLE_EXTRA_ARGS += $(KRB5_EXTRA_ARGS)
kdc:
- $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
- -f 30 -i hosts -l kdc playbooks/kdc.yml
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+ -i $(KDEVOPS_HOSTFILE) -l kdc \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/kdc.yml
krb5:
- $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
- -f 30 -i hosts -l krb5 playbooks/krb5.yml
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+ -i $(KDEVOPS_HOSTFILE) -l krb5 \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/krb5.yml
KDEVOPS_BRING_UP_DEPS += kdc
KDEVOPS_BRING_UP_LATE_DEPS += krb5
diff --git a/scripts/ktls.Makefile b/scripts/ktls.Makefile
index 905f6887f74a..ee1de731329f 100644
--- a/scripts/ktls.Makefile
+++ b/scripts/ktls.Makefile
@@ -1,8 +1,10 @@
ifeq (y,$(CONFIG_KDEVOPS_SETUP_KTLS))
ktls:
- $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
- -f 30 -i hosts playbooks/ktls.yml
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+ -i $(KDEVOPS_HOSTFILE) \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/ktls.yml
ktls-destroy:
$(Q)rm -rf $(TOPDIR)/ca
diff --git a/scripts/nfsd.Makefile b/scripts/nfsd.Makefile
index 39e4a817421a..79b980123591 100644
--- a/scripts/nfsd.Makefile
+++ b/scripts/nfsd.Makefile
@@ -28,8 +28,10 @@ PHONY += extend-extra-args-nfsd
ANSIBLE_EXTRA_ARGS += $(NFSD_EXTRA_ARGS)
nfsd:
- $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
- -f 30 -i hosts -l nfsd playbooks/nfsd.yml
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+ -i $(KDEVOPS_HOSTFILE) -l nfsd \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/nfsd.yml
KDEVOPS_BRING_UP_DEPS += nfsd
diff --git a/scripts/rdma.Makefile b/scripts/rdma.Makefile
index dd2a70120eb2..5c8b60d72f25 100644
--- a/scripts/rdma.Makefile
+++ b/scripts/rdma.Makefile
@@ -1,8 +1,10 @@
ifeq (y,$(CONFIG_KDEVOPS_SETUP_RDMA_SIW))
siw:
- $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
- -f 30 -i hosts playbooks/siw.yml
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+ -i $(KDEVOPS_HOSTFILE) \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/siw.yml
KDEVOPS_BRING_UP_DEPS += siw
@@ -13,8 +15,10 @@ endif
ifeq (y,$(CONFIG_KDEVOPS_SETUP_RDMA_RXE))
rxe:
- $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
- -f 30 -i hosts playbooks/rxe.yml
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+ -i $(KDEVOPS_HOSTFILE) \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/rxe.yml
KDEVOPS_BRING_UP_DEPS += rxe
diff --git a/scripts/smbd.Makefile b/scripts/smbd.Makefile
index 77d7727b137a..1be5b93411a5 100644
--- a/scripts/smbd.Makefile
+++ b/scripts/smbd.Makefile
@@ -8,8 +8,10 @@ SMBD_EXTRA_ARGS += kdevops_smbd_enable=True
ANSIBLE_EXTRA_ARGS += $(SMBD_EXTRA_ARGS)
smbd:
- $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
- -f 30 -i hosts -l smbd playbooks/smbd.yml
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+ -i $(KDEVOPS_HOSTFILE) -l smbd \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/smbd.yml
KDEVOPS_BRING_UP_DEPS += smbd
diff --git a/scripts/systemd-timesync.Makefile b/scripts/systemd-timesync.Makefile
index f62edc0c7e57..9b84b4a11359 100644
--- a/scripts/systemd-timesync.Makefile
+++ b/scripts/systemd-timesync.Makefile
@@ -21,8 +21,7 @@ endif
timesyncd-client:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
- -f 30 -i hosts \
- --extra-vars '{ kdevops_cli_install: True }' \
+ -i hosts --extra-vars '{ kdevops_cli_install: True }' \
--tags vars_simple,timesyncd \
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
diff --git a/scripts/update_etc_hosts.Makefile b/scripts/update_etc_hosts.Makefile
index e4eb0bca655a..4da15ea52837 100644
--- a/scripts/update_etc_hosts.Makefile
+++ b/scripts/update_etc_hosts.Makefile
@@ -1,6 +1,6 @@
update_etc_hosts:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts playbooks/update_etc_hosts.yml
+ -i hosts playbooks/update_etc_hosts.yml
KDEVOPS_BRING_UP_DEPS_EARLY += update_etc_hosts
diff --git a/workflows/blktests/Makefile b/workflows/blktests/Makefile
index 12764be2704c..33fb6482e2fa 100644
--- a/workflows/blktests/Makefile
+++ b/workflows/blktests/Makefile
@@ -67,11 +67,15 @@ extend-extra-args-blktests:
blktests:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts playbooks/blktests.yml --skip-tags run_tests,copy_results $(LIMIT_HOSTS)
+ -i hosts playbooks/blktests.yml \
+ --skip-tags run_tests,copy_results $(LIMIT_HOSTS)
blktests-baseline:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/blktests.yml --tags run_tests,copy_results --extra-vars '{ $(BLKTESTS_DYNAMIC_RUNTIME_VARS) }' --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
+ -i hosts -l baseline playbooks/blktests.yml \
+ --tags run_tests,copy_results \
+ --extra-vars '{ $(BLKTESTS_DYNAMIC_RUNTIME_VARS) }' \
+ --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
blktests-baseline-loop:
$(Q)$(BLKTEST_KERNEL_CI_LOOP) baseline $(LIMIT_HOSTS)
@@ -81,25 +85,41 @@ blktests-baseline-kernelci:
blktests-baseline-skip-kdevops-update:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/blktests.yml --tags run_tests,copy_results --skip-tags git_update --extra-vars '{ $(BLKTESTS_DYNAMIC_RUNTIME_VARS) }' --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
+ -i hosts -l baseline playbooks/blktests.yml \
+ --tags run_tests,copy_results --skip-tags git_update \
+ --extra-vars '{ $(BLKTESTS_DYNAMIC_RUNTIME_VARS) }' \
+ --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
blktests-baseline-run-oscheck-only:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/blktests.yml --tags run_tests,copy_results --skip-tags git_update,reboot,clean_results --extra-vars '{ $(BLKTESTS_DYNAMIC_RUNTIME_VARS) }' --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
+ -i hosts -l baseline playbooks/blktests.yml \
+ --tags run_tests,copy_results \
+ --skip-tags git_update,reboot,clean_results \
+ --extra-vars '{ $(BLKTESTS_DYNAMIC_RUNTIME_VARS) }' \
+ --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
blktests-dev:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/blktests.yml --tags run_tests,copy_results --extra-vars '{ $(BLKTESTS_DYNAMIC_RUNTIME_VARS) }' --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
+ -i hosts -l dev playbooks/blktests.yml \
+ --tags run_tests,copy_results \
+ --extra-vars '{ $(BLKTESTS_DYNAMIC_RUNTIME_VARS) }' \
+ --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
blktests-baseline-results:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/blktests.yml --tags copy_results,print_results --extra-vars '{ kdevops_run_blktests: True }' --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
+ -i hosts -l baseline playbooks/blktests.yml \
+ --tags copy_results,print_results \
+ --extra-vars '{ kdevops_run_blktests: True }' \
+ --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
blktests-results: blktests-baseline-results
blktests-dev-results:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/blktests.yml --tags copy_results,print_results --extra-vars '{ kdevops_run_blktests: True }' --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
+ -i hosts -l dev playbooks/blktests.yml \
+ --tags copy_results,print_results \
+ --extra-vars '{ kdevops_run_blktests: True }' \
+ --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
blktests-help-menu:
@echo "blktests options:"
diff --git a/workflows/common/Makefile b/workflows/common/Makefile
index 363683149ed6..cfbebebd8ce2 100644
--- a/workflows/common/Makefile
+++ b/workflows/common/Makefile
@@ -38,7 +38,8 @@ endif # CONFIG_WORKFLOW_INFER_USER_AND_GROUP == y
ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_GIT_CLONES_KDEVOPS_GIT))
kdevops-git-reset:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts playbooks/common.yml --tags vars,kdevops_reset --extra-vars '{ kdevops_git_reset: True }' $(LIMIT_HOSTS)
+ -i hosts playbooks/common.yml --tags vars,kdevops_reset \
+ --extra-vars '{ kdevops_git_reset: True }' $(LIMIT_HOSTS)
kdevops-help-menu:
@echo "Common workflow options:"
diff --git a/workflows/cxl/Makefile b/workflows/cxl/Makefile
index 44ca257d2636..11d3e8582b43 100644
--- a/workflows/cxl/Makefile
+++ b/workflows/cxl/Makefile
@@ -20,42 +20,42 @@ include $(TOPDIR)/workflows/cxl/Makefile.kernel
cxl:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts playbooks/cxl.yml \
+ -i hosts playbooks/cxl.yml \
--skip-tags run_tests,copy_results \
$(LIMIT_HOSTS)
cxl-test-probe:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts playbooks/cxl.yml \
+ -i hosts playbooks/cxl.yml \
--tags vars,cxl-test-prep,cxl-test-probe \
--extra-vars '{ $(CXL_DYNAMIC_RUNTIME_VARS) }' \
$(LIMIT_HOSTS)
cxl-test-meson:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts playbooks/cxl.yml \
+ -i hosts playbooks/cxl.yml \
--tags vars,cxl-test-prep,cxl-test-meson \
--extra-vars '{ $(CXL_DYNAMIC_RUNTIME_VARS) }' \
$(LIMIT_HOSTS)
cxl-results:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts playbooks/cxl.yml \
+ -i hosts playbooks/cxl.yml \
--tags vars,copy_results $(LIMIT_HOSTS)
cxl-mem-setup:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts playbooks/cxl.yml \
+ -i hosts playbooks/cxl.yml \
--tags vars,extra-vars,cxl-mem-setup $(LIMIT_HOSTS)
cxl-create-dc-region:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts playbooks/cxl.yml \
+ -i hosts playbooks/cxl.yml \
--tags vars,cxl-create-dc-region $(LIMIT_HOSTS)
cxl-dcd-setup:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts playbooks/cxl.yml \
+ -i hosts playbooks/cxl.yml \
--tags vars,cxl-dcd-setup $(LIMIT_HOSTS)
cxl-help-menu:
diff --git a/workflows/demos/reboot-limit/Makefile b/workflows/demos/reboot-limit/Makefile
index 1d43941f6598..a6b4aaf788bd 100644
--- a/workflows/demos/reboot-limit/Makefile
+++ b/workflows/demos/reboot-limit/Makefile
@@ -25,7 +25,7 @@ REBOOT_LIMIT_TEST_TYPE :=$(subst ",,$(CONFIG_REBOOT_LIMIT_TEST_TYPE))
# into the file extra_vars.yaml. The extra_vars.yaml file is always used as an
# argument to ansible so that it reads our manually converted kconfig varibles
# in ansible. We typically call a playbook with something like:
-# ansible-playbook -f 30 -i hosts -l baseline playbooks/foo.yml --tags bar --extra-vars=@./extra_vars.yaml
+# ansible-playbook -i hosts -l baseline playbooks/foo.yml --tags bar --extra-vars=@./extra_vars.yaml
#
# Likewise most playbooks also have something like the following as their first
# task in their playbooks, so that they don't have to be specifying the
@@ -104,7 +104,8 @@ endif # CONFIG_KERNEL_CI
# with tags "run_tests" or "copy_results".
reboot-limit:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts playbooks/reboot-limit.yml --skip-tags run_tests,copy_results
+ -i hosts playbooks/reboot-limit.yml \
+ --skip-tags run_tests,copy_results
# kdevops supports generic workflows such as the enabling you to then use the
# /data/ partition to git clone linux, compile linux, install it and reboot
@@ -133,9 +134,12 @@ reboot-limit:
# fly.
reboot-limit-baseline:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/reboot-limit.yml --tags vars,first_run,reset --extra-vars=@./extra_vars.yaml
+ -i hosts -l baseline playbooks/reboot-limit.yml \
+ --tags vars,first_run,reset --extra-vars=@./extra_vars.yaml
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/reboot-limit.yml --tags vars,run_tests,copy_results --extra-vars=@./extra_vars.yaml
+ -i hosts -l baseline playbooks/reboot-limit.yml \
+ --tags vars,run_tests,copy_results \
+ --extra-vars=@./extra_vars.yaml
# Once you know the baseline works, you may want to run the baseline in a loop
# up to the number of times you define. We define this goal in kdevops as
@@ -151,14 +155,18 @@ reboot-limit-baseline-kernelci:
# Resets the boot counters so we start from scratch
reboot-limit-baseline-reset:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/reboot-limit.yml --tags vars,reset --extra-vars=@./extra_vars.yaml
+ -i hosts -l baseline playbooks/reboot-limit.yml \
+ --tags vars,reset --extra-vars=@./extra_vars.yaml
# Below are the corresponding dev targets
reboot-limit-dev-baseline:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/reboot-limit.yml --tags vars,first_run,reset --extra-vars=@./extra_vars.yaml
+ -i hosts -l dev playbooks/reboot-limit.yml \
+ --tags vars,first_run,reset --extra-vars=@./extra_vars.yaml
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/reboot-limit.yml --tags vars,run_tests,copy_results --extra-vars=@./extra_vars.yaml
+ -i hosts -l dev playbooks/reboot-limit.yml \
+ --tags vars,run_tests,copy_results \
+ --extra-vars=@./extra_vars.yaml
reboot-limit-dev-loop:
$(Q)$(REBOOT_LIMIT_KERNEL_CI_LOOP) dev
@@ -168,7 +176,8 @@ reboot-limit-dev-kernelci:
reboot-limit-dev-reset:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/reboot-limit.yml --tags vars,reset --extra-vars=@./extra_vars.yaml
+ -i hosts -l dev playbooks/reboot-limit.yml --tags vars,reset \
+ --extra-vars=@./extra_vars.yaml
reboot-limit-help-menu:
@echo "reboot-limit options:"
diff --git a/workflows/fstests/Makefile b/workflows/fstests/Makefile
index 6e38ba815e93..a5e307b61b39 100644
--- a/workflows/fstests/Makefile
+++ b/workflows/fstests/Makefile
@@ -139,17 +139,18 @@ endif
fstests: $(FSTESTS_BASELINE_EXTRA)
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l localhost,baseline,dev \
- -f 30 -i hosts playbooks/fstests.yml --skip-tags run_tests,copy_results $(LIMIT_HOSTS)
+ -i hosts playbooks/fstests.yml \
+ --skip-tags run_tests,copy_results $(LIMIT_HOSTS)
fstests-kdevops-setup: $(KDEVOPS_EXTRA_VARS) $(FSTESTS_BASELINE_EXTRA)
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
- -f 30 -i hosts playbooks/fstests.yml \
+ -i hosts playbooks/fstests.yml \
--tags vars,kdevops_fstests_setup,gendisks \
$(LIMIT_HOSTS)
fstests-baseline: $(FSTESTS_BASELINE_EXTRA)
$(Q)PYTHONUNBUFFERED=1 ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/fstests.yml \
+ -i hosts -l baseline playbooks/fstests.yml \
--tags vars,run_tests,copy_results \
--extra-vars '{ $(FSTESTS_DYNAMIC_RUNTIME_VARS) }' \
--extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
@@ -162,7 +163,7 @@ fstests-baseline-kernelci: $(KDEVOPS_EXTRA_VARS)
fstests-baseline-skip-kdevops-update: $(KDEVOPS_EXTRA_VARS)
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/fstests.yml \
+ -i hosts -l baseline playbooks/fstests.yml \
--tags run_tests,copy_results \
--skip-tags git_update \
--extra-vars \
@@ -172,7 +173,7 @@ fstests-baseline-skip-kdevops-update: $(KDEVOPS_EXTRA_VARS)
fstests-baseline-run-oscheck-only: $(KDEVOPS_EXTRA_VARS)
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/fstests.yml \
+ -i hosts -l baseline playbooks/fstests.yml \
--tags run_tests,copy_results \
--skip-tags git_update,reboot,clean_results \
--extra-vars \
@@ -182,7 +183,7 @@ fstests-baseline-run-oscheck-only: $(KDEVOPS_EXTRA_VARS)
fstests-config: $(KDEVOPS_EXTRA_VARS)
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/fstests.yml \
+ -i hosts -l baseline playbooks/fstests.yml \
--tags vars,generate-fstests-config \
--extra-vars=@./extra_vars.yaml \
$(LIMIT_HOSTS)
@@ -197,7 +198,7 @@ fstests-config-debug: $(KDEVOPS_EXTRA_VARS)
fstests-dev: $(KDEVOPS_EXTRA_VARS)
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/fstests.yml \
+ -i hosts -l dev playbooks/fstests.yml \
--tags vars,run_tests,copy_results \
--extra-vars \
'{ $(FSTESTS_DYNAMIC_RUNTIME_VARS) }' \
@@ -205,7 +206,7 @@ fstests-dev: $(KDEVOPS_EXTRA_VARS)
fstests-baseline-results-tfb-ls: $(KDEVOPS_EXTRA_VARS)
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/fstests.yml \
+ -i hosts -l baseline playbooks/fstests.yml \
--tags vars,tfb \
--skip-tags copy_final \
--extra-vars \
@@ -214,7 +215,7 @@ fstests-baseline-results-tfb-ls: $(KDEVOPS_EXTRA_VARS)
fstests-baseline-results-tfb-trim: $(KDEVOPS_EXTRA_VARS)
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/fstests.yml \
+ -i hosts -l baseline playbooks/fstests.yml \
--tags vars,tfb \
--skip-tags copy_final \
--extra-vars \
@@ -223,7 +224,7 @@ fstests-baseline-results-tfb-trim: $(KDEVOPS_EXTRA_VARS)
fstests-baseline-results: $(KDEVOPS_EXTRA_VARS)
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/fstests.yml \
+ -i hosts -l baseline playbooks/fstests.yml \
--tags copy_results,print_results,tfb \
--extra-vars '{ kdevops_run_fstests: True }' \
--extra-vars=@./extra_vars.yaml \
@@ -233,7 +234,7 @@ fstests-results: fstests-baseline-results
fstests-dev-results: $(KDEVOPS_EXTRA_VARS)
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/fstests.yml \
+ -i hosts -l dev playbooks/fstests.yml \
--tags copy_results,print_results \
--extra-vars '{ kdevops_run_fstests: True }' \
--extra-vars=@./extra_vars.yaml \
diff --git a/workflows/gitr/Makefile b/workflows/gitr/Makefile
index 59c6dd50cd17..b8a1b3a43991 100644
--- a/workflows/gitr/Makefile
+++ b/workflows/gitr/Makefile
@@ -89,15 +89,17 @@ XARGS_ARGS := -I {} bash -c 'echo "{}:"; cat {}; echo;'
endif
gitr:
- $(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
- -f 30 -i hosts playbooks/gitr.yml \
- --skip-tags run_tests,run_specific_tests,copy_results
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+ -i $(KDEVOPS_HOSTFILE) -l baseline,dev \
+ --skip-tags run_tests,run_specific_tests,copy_results \
+ $(KDEVOPS_PLAYBOOKS_DIR)/gitr.yml
gitr-baseline:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/gitr.yml \
+ -i $(KDEVOPS_HOSTFILE) -l baseline \
--tags $(GITR_PLAY_TAGS) \
- --extra-vars=@./extra_vars.yaml
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/gitr.yml
gitr-baseline-loop:
$(Q)$(GITR_KERNEL_CI_LOOP) baseline
@@ -107,9 +109,10 @@ gitr-baseline-kernelci:
gitr-dev-baseline:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/gitr.yml \
+ -i $(KDEVOPS_HOSTFILE) -l dev \
--tags $(GITR_PLAY_TAGS) \
- --extra-vars=@./extra_vars.yaml
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/gitr.yml
gitr-dev-loop:
$(Q)$(GITR_KERNEL_CI_LOOP) dev
@@ -119,7 +122,10 @@ gitr-dev-kernelci:
gitr-dev-reset:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/gitr.yml --tags vars,reset --extra-vars=@./extra_vars.yaml
+ -i $(KDEVOPS_HOSTFILE) -l dev \
+ --tags vars,reset \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/gitr.yml
gitr-show-results:
@find $(FIND_PATH) -type f $(PATTERN) \
diff --git a/workflows/ltp/Makefile b/workflows/ltp/Makefile
index e946be722695..081e8364d7f7 100644
--- a/workflows/ltp/Makefile
+++ b/workflows/ltp/Makefile
@@ -115,14 +115,17 @@ XARGS_ARGS := -I {} bash -c 'echo "{}:"; cat {}; echo;'
endif
ltp:
- $(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
- -f 30 -i hosts playbooks/ltp.yml --skip-tags run_tests,copy_results
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+ -i $(KDEVOPS_HOSTFILE) -l baseline,dev \
+ --skip-tags run_tests,copy_results \
+ $(KDEVOPS_PLAYBOOKS_DIR)/ltp.yml
ltp-baseline:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/ltp.yml \
+ -i $(KDEVOPS_HOSTFILE) -l baseline \
--tags vars,run_tests,copy_results \
- --extra-vars=@./extra_vars.yaml
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/ltp.yml
ltp-baseline-loop:
$(Q)$(LTP_KERNEL_CI_LOOP) baseline
@@ -132,8 +135,10 @@ ltp-baseline-kernelci:
ltp-dev-baseline:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/ltp.yml \
- --tags vars,run_tests,copy_results --extra-vars=@./extra_vars.yaml
+ -i $(KDEVOPS_HOSTFILE) -l dev \
+ --tags vars,run_tests,copy_results \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/ltp.yml
ltp-dev-loop:
$(Q)$(LTP_KERNEL_CI_LOOP) dev
@@ -143,8 +148,10 @@ ltp-dev-kernelci:
ltp-dev-reset:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/ltp.yml \
- --tags vars,reset --extra-vars=@./extra_vars.yaml
+ -i $(KDEVOPS_HOSTFILE) -l dev \
+ --tags vars,reset \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/ltp.yml
ltp-show-results:
@find $(FIND_PATH) -type f $(PATTERN) \
diff --git a/workflows/nfstest/Makefile b/workflows/nfstest/Makefile
index 7cac03920feb..80c00c12c205 100644
--- a/workflows/nfstest/Makefile
+++ b/workflows/nfstest/Makefile
@@ -72,15 +72,17 @@ XARGS_ARGS := -I {} bash -c 'echo "{}:"; cat {}; echo;'
endif
nfstest:
- $(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
- -f 30 -i hosts playbooks/nfstest.yml \
- --skip-tags run_tests,copy_results
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+ -i $(KDEVOPS_HOSTFILE) -l baseline,dev \
+ --skip-tags run_tests,copy_results \
+ $(KDEVOPS_PLAYBOOKS_DIR)/nfstest.yml
nfstest-baseline:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/nfstest.yml \
+ -i $(KDEVOPS_HOSTFILE) -l baseline \
--tags vars,run_tests,copy_results \
- --extra-vars=@./extra_vars.yaml
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/nfstest.yml
nfstest-baseline-loop:
$(Q)$(NFSTEST_KERNEL_CI_LOOP) baseline
@@ -90,9 +92,10 @@ nfstest-baseline-kernelci:
nfstest-dev-baseline:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/nfstest.yml \
+ -i $(KDEVOPS_HOSTFILE) -l dev \
--tags vars,run_tests,copy_results \
- --extra-vars=@./extra_vars.yaml
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/nfstest.yml
nfstest-dev-loop:
$(Q)$(NFSTEST_KERNEL_CI_LOOP) dev
@@ -102,9 +105,10 @@ nfstest-dev-kernelci:
nfstest-dev-reset:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/nfstest.yml \
+ -i $(KDEVOPS_HOSTFILE) -l dev \
--tags vars,reset \
- --extra-vars=@./extra_vars.yaml
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/nfstest.yml
nfstest-show-results:
@find $(FIND_PATH) -type f $(PATTERN) \
diff --git a/workflows/pynfs/Makefile b/workflows/pynfs/Makefile
index c69b80492268..dc4b29c52ccf 100644
--- a/workflows/pynfs/Makefile
+++ b/workflows/pynfs/Makefile
@@ -44,14 +44,22 @@ endif
# Makefile for pynfs targets
pynfs:
- $(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
- -f 30 -i hosts playbooks/pynfs.yml --skip-tags run_tests,copy_results,clean_local_results
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+ -i $(KDEVOPS_HOSTFILE) -l baseline,dev \
+ --skip-tags run_tests,copy_results,clean_local_results \
+ $(KDEVOPS_PLAYBOOKS_DIR)/pynfs.yml
pynfs-baseline:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/pynfs.yml --tags vars,first_run,reset --extra-vars=@./extra_vars.yaml
+ -i $(KDEVOPS_HOSTFILE) -l baseline \
+ --tags vars,first_run,reset \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/pynfs.yml
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/pynfs.yml --tags vars,run_tests,copy_results --extra-vars=@./extra_vars.yaml
+ -i $(KDEVOPS_HOSTFILE) -l baseline \
+ --tags vars,run_tests,copy_results \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/pynfs.yml
# Once you know the baseline works, you may want to run the baseline in a loop
# up to the number of times you define. We define this goal in kdevops as
@@ -67,9 +75,15 @@ pynfs-baseline-kernelci:
# Below are the corresponding dev targets
pynfs-dev-baseline:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/pynfs.yml --tags vars,first_run,reset --extra-vars=@./extra_vars.yaml
+ -i $(KDEVOPS_HOSTFILE) -l dev \
+ --tags vars,first_run,reset \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/pynfs.yml
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/pynfs.yml --tags vars,run_tests,copy_results --extra-vars=@./extra_vars.yaml
+ -i $(KDEVOPS_HOSTFILE) -l dev \
+ --tags vars,run_tests,copy_results \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/pynfs.yml
pynfs-dev-loop:
$(Q)$(PYNFS_KERNEL_CI_LOOP) dev
@@ -79,7 +93,10 @@ pynfs-dev-kernelci:
pynfs-dev-reset:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l dev playbooks/pynfs.yml --tags vars,reset --extra-vars=@./extra_vars.yaml
+ -i $(KDEVOPS_HOSTFILE) -l dev \
+ --tags vars,reset \
+ --extra-vars=@./extra_vars.yaml \
+ $(KDEVOPS_PLAYBOOKS_DIR)/pynfs.yml
pynfs-show-results:
@find $(FIND_PATH) -type f $(PATTERN) \
diff --git a/workflows/selftests/Makefile b/workflows/selftests/Makefile
index 7a329cc9f9e9..075da61b0c26 100644
--- a/workflows/selftests/Makefile
+++ b/workflows/selftests/Makefile
@@ -33,24 +33,24 @@ include $(TOPDIR)/workflows/selftests/tests/Makefile.xarray
selftests:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts playbooks/selftests.yml \
+ -i hosts playbooks/selftests.yml \
--skip-tags run_tests,copy_results,check_results \
$(LIMIT_HOSTS)
selftests-baseline:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/selftests.yml \
+ -i hosts -l baseline playbooks/selftests.yml \
--extra-vars '{ $(SELFTESTS_DYNAMIC_RUNTIME_VARS) }' \
--tags vars,run_tests,copy_results,check_results $(LIMIT_HOSTS)
selftests-results:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/selftests.yml \
+ -i hosts -l baseline playbooks/selftests.yml \
--tags vars,copy_results,check_results $(LIMIT_HOSTS)
selftests-check-results:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
- -f 30 -i hosts -l baseline playbooks/selftests.yml \
+ -i hosts -l baseline playbooks/selftests.yml \
--tags vars,check_results $(LIMIT_HOSTS)
selftests-help-main:
--
2.49.0
next prev parent reply other threads:[~2025-04-17 17:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-17 17:21 [PATCH 1/2] ansible: Increase default task parallelism cel
2025-04-17 17:21 ` cel [this message]
2025-04-18 3:06 ` [PATCH 2/2] Makefile: Remove "-f 30" command line argument 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=20250417172119.3190398-2-cel@kernel.org \
--to=cel@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=kdevops@lists.linux.dev \
--cc=mcgrof@kernel.org \
/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