ansible: Increase default task parallelism
PATCH 1/2 ansible: Increase default task parallelism
From: Chuck Lever <[email protected]>
Workflows with more than 5 target nodes were serializing on roles that did not have "-f 30" specified explicitly.
Reviewed-by Luis Chamberlain <[email protected]>
Signed-off-by Chuck Lever <[email protected]>
--- kconfigs/Kconfig.ansible_cfg | 35 +++++++++++++++++++ playbooks/roles/ansible_cfg/defaults/main.yml | 1 + .../ansible_cfg/templates/ansible.cfg.j2 | 1 + 3 files changed, 37 insertions(+)
kconfigs/Kconfig.ansible_cfg +35 -0
@@ -6,6 +6,10 @@ config ANSIBLE_CFG_INTERPRETER_PYTHON_SET_BY_CLI bool default $(shell, scripts/check-cli-set-var.sh ANSIBLE_CFG_INTERPRETER_PYTHON) +config ANSIBLE_CFG_FORKS_SET_BY_CLI + bool + default $(shell, scripts/check-cli-set-var.sh ANSIBLE_CFG_FORKS) + menu "Ansible Callback Plugin Configuration" choice prompt "Ansible Callback Plugin"
@@ -172,6 +176,37 @@ config ANSIBLE_CFG_INTERPRETER_PYTHON_STRING endmenu +config ANSIBLE_CFG_FORKS_CUSTOM + bool "Enable a custom Ansible forks setting" + default n + help + When this setting is enabled, specify the maximum number + of concurrent Ansible tasks (forks) via Kconfig. When this + setting is disabled, kdevops chooses a default value that + can be overridden with "ANSIBLE_CFG_FORKS=NN" on the + "make" command line. + +if ANSIBLE_CFG_FORKS_CUSTOM + +config ANSIBLE_CFG_FORKS + int "forks" + output yaml + help + Set the maximum number of concurrent Ansible tasks (forks). + https://docs.ansible.com/ansible/latest/playbook_guide/playbooks_strategies.html#setting-the-number-of-forks + +endif # ANSIBLE_CFG_FORKS_CUSTOM + +if !ANSIBLE_CFG_FORKS_CUSTOM + +config ANSIBLE_CFG_FORKS + int + output yaml + default 10 if !ANSIBLE_CFG_FORKS_SET_BY_CLI + default $(shell, ./scripts/append-makefile-vars-int.sh $(ANSIBLE_CFG_FORKS)) if ANSIBLE_CFG_FORKS_SET_BY_CLI + +endif # !ANSIBLE_CFG_FORKS_CUSTOM + if DISTRO_OPENSUSE config ANSIBLE_CFG_RECONNECTION_RETRIES
playbooks/roles/ansible_cfg/defaults/main.yml +1 -0
@@ -9,3 +9,4 @@ ansible_cfg_callback_plugin_show_custom_stats: false ansible_cfg_callback_plugin_show_per_host_start: true ansible_cfg_callback_plugin_show_task_path_on_failure: true ansible_cfg_interpreter_python: "auto_silent" +ansible_cfg_forks: 10
playbooks/roles/ansible_cfg/templates/ansible.cfg.j2 +1 -0
@@ -9,6 +9,7 @@ show_custom_stats = {{ ansible_cfg_callback_plugin_show_custom_stats }} show_per_host_start = {{ ansible_cfg_callback_plugin_show_per_host_start }} show_task_path_on_failure = {{ ansible_cfg_callback_plugin_show_task_path_on_failure }} interpreter_python = {{ ansible_cfg_interpreter_python_string }} +forks = {{ ansible_cfg_forks }} {% if ansible_facts['distribution'] == 'openSUSE' %} [connection] retries = {{ ansible_cfg_reconnection_retries }}
Signature · 1 line
2.49.0
PATCH 2/2 Makefile: Remove "-f 30" command line argument
From: Chuck Lever <[email protected]>
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 <[email protected]>
Signed-off-by Chuck Lever <[email protected]>
--- 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(-)
scripts/firstconfig.Makefile +1 -2
@@ -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
scripts/iscsi.Makefile +4 -2
@@ -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
scripts/journal-server.Makefile +4 -8
@@ -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
scripts/kotd.Makefile +6 -3
@@ -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:"
scripts/krb5.Makefile +8 -4
@@ -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
scripts/ktls.Makefile +4 -2
@@ -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
scripts/nfsd.Makefile +4 -2
@@ -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
scripts/rdma.Makefile +8 -4
@@ -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
scripts/smbd.Makefile +4 -2
@@ -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
scripts/systemd-timesync.Makefile +1 -2
@@ -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
scripts/update_etc_hosts.Makefile +1 -1
@@ -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
workflows/blktests/Makefile +27 -7
@@ -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:"
workflows/common/Makefile +2 -1
@@ -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:"
workflows/cxl/Makefile +7 -7
@@ -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:
workflows/demos/reboot-limit/Makefile +17 -8
@@ -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:"
workflows/fstests/Makefile +12 -11
@@ -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 \
workflows/gitr/Makefile +14 -8
@@ -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) \
workflows/ltp/Makefile +15 -8
@@ -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) \
workflows/nfstest/Makefile +13 -9
@@ -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) \
workflows/pynfs/Makefile +24 -7
@@ -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) \
workflows/selftests/Makefile +4 -4
@@ -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:
Signature · 1 line
2.49.0
Re: [PATCH 2/2] Makefile: Remove "-f 30" command line argument
Quoted 8 lines · On Thu, Apr 17, 2025 at 01:21:19PM -0400, [email protected] wrote:
From: Chuck Lever <[email protected]>
We can now set the maximum forks globally in ansible.cfg, and it can be adjusted with
Kconfigor cli. Remove explicit fork settings from Makefiles.Suggested-by Luis Chamberlain <[email protected]>Signed-off-by Chuck Lever <[email protected]>
Oh-hell-yeah: Luis Chamberlain <[email protected]>
Luis