[PATCH v4 1/2] ansible: use native verbosity config instead of custom AV variable
Daniel Gomez <[email protected]> Tue, 02 Dec 2025 00:11:16 +0100
| Newsgroups | dev.linux.lists.kdevops |
|---|---|
| Message-ID | <[email protected]> |
From: Daniel Gomez <[email protected]> Replace the custom AV makefile variable and validate_av.py script with Ansible's native verbosity configuration. The verbosity level is now configured via the verbosity key in ansible.cfg, which can be set through the new ANSIBLE_CFG_VERBOSITY Kconfig option. This change removes the $(ANSIBLE_VERBOSE) variable from all 52 Makefiles that were passing it to ansible-playbook calls. Since ansible.cfg now contains the verbosity setting, the command-line argument is no longer needed. The runtime override is now done using the standard ANSIBLE_VERBOSITY environment variable instead of the custom AV=N syntax. Generated-by: Claude AI Signed-off-by: Daniel Gomez <[email protected]> --- CLAUDE.md | 6 ++--- Makefile | 6 ++--- Makefile.btrfs_progs | 2 +- Makefile.build_qemu | 8 +++---- Makefile.docker-mirror | 4 ++-- Makefile.hypervisor-tunings | 2 +- Makefile.kdevops | 10 ++++---- Makefile.postfix | 2 +- docs/fio-tests.md | 2 +- docs/monitoring.md | 2 +- docs/reboot-limit.md | 2 +- kconfigs/Kconfig.ansible_cfg | 20 ++++++++++++++++ .../roles/ansible_cfg/templates/ansible.cfg.j2 | 1 + scripts/ansible.Makefile | 3 --- scripts/archive.Makefile | 2 +- scripts/devconfig.Makefile | 4 ++-- scripts/dynamic-pci-kconfig.Makefile | 2 +- scripts/firstconfig.Makefile | 2 +- scripts/guestfs.Makefile | 18 +++++++------- scripts/install-menuconfig-deps.Makefile | 2 +- scripts/install-rcloud-deps.Makefile | 2 +- scripts/iscsi.Makefile | 2 +- scripts/journal-server.Makefile | 10 ++++---- scripts/kconfig/Makefile | 2 +- scripts/kotd.Makefile | 6 ++--- scripts/krb5.Makefile | 4 ++-- scripts/ktls.Makefile | 2 +- scripts/nfsd.Makefile | 2 +- scripts/nixos.Makefile | 10 ++++---- scripts/provision.Makefile | 2 +- scripts/rdma.Makefile | 4 ++-- scripts/smbd.Makefile | 2 +- scripts/systemd-timesync.Makefile | 4 ++-- scripts/terraform.Makefile | 14 +++++------ scripts/update_etc_hosts.Makefile | 2 +- scripts/validate_av.py | 28 ---------------------- workflows/ai/Makefile | 20 ++++++++-------- workflows/blktests/Makefile | 16 ++++++------- workflows/build-linux/Makefile | 8 +++---- workflows/common/Makefile | 2 +- workflows/cxl/Makefile | 14 +++++------ workflows/demos/reboot-limit/Makefile | 14 +++++------ workflows/fio-tests/Makefile | 12 +++++----- workflows/fstests/Makefile | 28 +++++++++++----------- workflows/gitr/Makefile | 8 +++---- workflows/linux/Makefile | 28 +++++++++++----------- workflows/ltp/Makefile | 8 +++---- workflows/minio/Makefile | 10 ++++---- workflows/mmtests/Makefile | 16 ++++++------- workflows/nfstest/Makefile | 8 +++---- workflows/pynfs/Makefile | 12 +++++----- workflows/rcloud/Makefile | 4 ++-- workflows/selftests/Makefile | 8 +++---- workflows/steady_state/Makefile | 8 +++---- workflows/sysbench/Makefile | 16 ++++++------- workflows/vllm/Makefile | 20 ++++++++-------- 56 files changed, 223 insertions(+), 233 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 28920130..5c9091d9 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -121,7 +121,7 @@ make mmtests-compare # Compare baseline vs dev results (A/B testing) ```bash make help # Show available targets make V=1 [target] # Verbose build output -make AV=1-6 [target] # Ansible verbose output (levels 0-6) +ANSIBLE_VERBOSITY=1-6 make [target] # Ansible verbose output (levels 0-6) make dynconfig # Generate dynamic configuration make style # Check for whitespace issues - ALWAYS run before completing work make fix-whitespace-last-commit # Fixes commit white space damage @@ -986,7 +986,7 @@ tasks complete, leading to variable access before they're properly set. ```bash # Run with verbose output to see variable resolution -make target AV=3 # Ansible verbose level 3 +ANSIBLE_VERBOSITY=3 make target # Ansible verbose level 3 ``` ### A/B Testing Variable Resolution Example @@ -1045,7 +1045,7 @@ When developing features that involve per-node variables: grep "active_.*:" extra_vars.yaml # Verify node-specific settings - make target AV=2 | grep -A5 -B5 "Set.*fact" + ANSIBLE_VERBOSITY=2 make target | grep -A5 -B5 "Set.*fact" ``` ### Common Patterns to Avoid diff --git a/Makefile b/Makefile index f8d36572..e58c99f9 100644 --- a/Makefile +++ b/Makefile @@ -234,7 +234,7 @@ include scripts/gen-nodes.Makefile false) $(ANSIBLE_CFG_FILE): .config - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ + $(Q)ansible-playbook --connection=local \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/ansible_cfg.yml \ --extra-vars=@./.extra_vars_auto.yaml @@ -264,13 +264,13 @@ include scripts/bringup.Makefile endif $(ANSIBLE_INVENTORY_FILE): .config $(ANSIBLE_CFG_FILE) $(KDEVOPS_HOSTS_TEMPLATE) $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ + $(Q)ansible-playbook --connection=local \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/gen_hosts.yml \ --extra-vars=@./extra_vars.yaml $(KDEVOPS_NODES): .config $(ANSIBLE_CFG_FILE) $(KDEVOPS_NODES_TEMPLATE) $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/gen_nodes.yml \ --extra-vars=@./extra_vars.yaml diff --git a/Makefile.btrfs_progs b/Makefile.btrfs_progs index 9ccfafa3..03a99ee5 100644 --- a/Makefile.btrfs_progs +++ b/Makefile.btrfs_progs @@ -5,7 +5,7 @@ BTRFS_PROGS_SETUP_ARGS += btrfs_progs_build=True PHONY += btrfs-progs btrfs-progs: $(KDEVOPS_NODES) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/btrfs-progs.yml \ --extra-vars=$(BTRFS_PROGS_SETUP_ARGS) $(LIMIT_HOSTS) diff --git a/Makefile.build_qemu b/Makefile.build_qemu index 2eac6e9b..44a5c24e 100644 --- a/Makefile.build_qemu +++ b/Makefile.build_qemu @@ -20,25 +20,25 @@ QEMU_BUILD_SETUP_ARGS += qemu_target="ppc64-softmmu" endif qemu: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \ --extra-vars=@./extra_vars.yaml PHONY += qemu qemu-install: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \ --extra-vars=@./extra_vars.yaml --tags vars,install PHONY += qemu-install qemu-configure: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \ --extra-vars=@./extra_vars.yaml --tags vars,configure PHONY += qemu-configure qemu-build: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \ --extra-vars=@./extra_vars.yaml --tags vars,build PHONY += qemu-build diff --git a/Makefile.docker-mirror b/Makefile.docker-mirror index 25e7a961..4501ef21 100644 --- a/Makefile.docker-mirror +++ b/Makefile.docker-mirror @@ -16,7 +16,7 @@ docker-mirror-help: docker-mirror: $(KDEVOPS_EXTRA_VARS) @echo "Setting up Docker registry mirror with automatic background updates..." - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --connection=local \ --tags docker-mirror \ $(KDEVOPS_PLAYBOOKS_DIR)/docker-mirror.yml \ @@ -52,7 +52,7 @@ docker-mirror-status: docker-mirror-pull: $(KDEVOPS_EXTRA_VARS) @echo "Manually triggering Docker image downloads..." @echo "This may take several minutes depending on image sizes and network speed." - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --connection=local \ --tags docker-mirror-pull \ $(KDEVOPS_PLAYBOOKS_DIR)/docker-mirror.yml \ diff --git a/Makefile.hypervisor-tunings b/Makefile.hypervisor-tunings index ff29b89c..abaf9025 100644 --- a/Makefile.hypervisor-tunings +++ b/Makefile.hypervisor-tunings @@ -14,7 +14,7 @@ HYPERVISOR_TUNING_ARGS += hypervisor_tunning_zswap_max_pool_percent=$(ZSWAP_MAX_ endif kdevops_hypervisor_tunning: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/hypervisor-tuning.yml \ --extra-vars=@./extra_vars.yaml PHONY += kdevops_hypervisor_tunning diff --git a/Makefile.kdevops b/Makefile.kdevops index fd03b392..46725d8a 100644 --- a/Makefile.kdevops +++ b/Makefile.kdevops @@ -8,28 +8,28 @@ kdevops_all: kdevops_deps PHONY := kdevops_all kdevops_terraform_deps: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/install_terraform.yml PHONY += kdevops_terraform_deps kdevops_install_libvirt: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "skip_configuration=True" kdevops_configure_libvirt: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "skip_install=True" \ -e 'running_user=$(USER)' kdevops_verify_libvirt_user: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "only_verify_user=True" PHONY += kdevops_verify_libvirt_user kdevops_libvirt_storage_pool_create: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/libvirt_storage_pool_create.yml PHONY += kdevops_libvirt_storage_pool_create diff --git a/Makefile.postfix b/Makefile.postfix index 226261ee..5840acc2 100644 --- a/Makefile.postfix +++ b/Makefile.postfix @@ -7,7 +7,7 @@ POSTFIX_SETUP_ARGS += postfix_relay_host_setup=True POSTFIX_SETUP_ARGS += postfix_relay_host=$(POSTFIX_RELAY_HOST) kdevops_postfix_setup_relay: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/postfix_relay_host.yml \ --extra-vars=@./extra_vars.yaml PHONY += kdevops_postfix_setup_relay diff --git a/docs/fio-tests.md b/docs/fio-tests.md index 3383d81a..1a77263c 100644 --- a/docs/fio-tests.md +++ b/docs/fio-tests.md @@ -308,7 +308,7 @@ CI-specific optimizations: Enable verbose output: ```bash make V=1 fio-tests # Verbose build output -make AV=2 fio-tests # Ansible verbose output +ANSIBLE_VERBOSITY=2 make fio-tests # Ansible verbose output ``` ## Performance considerations diff --git a/docs/monitoring.md b/docs/monitoring.md index 9eb10da8..b4800ec9 100644 --- a/docs/monitoring.md +++ b/docs/monitoring.md @@ -232,7 +232,7 @@ grep -E "enable_monitoring|monitor_" .config 2. **Check ansible output for monitoring tasks**: ```bash -make fstests-tests AV=2 | grep -A5 -B5 monitoring +ANSIBLE_VERBOSITY=2 make fstests-tests | grep -A5 -B5 monitoring ``` 3. **Look for error messages**: diff --git a/docs/reboot-limit.md b/docs/reboot-limit.md index 305d9ade..305d5d78 100644 --- a/docs/reboot-limit.md +++ b/docs/reboot-limit.md @@ -173,7 +173,7 @@ Enable verbose output for troubleshooting: ```bash # Ansible verbose mode -make reboot-limit-baseline AV=3 +ANSIBLE_VERBOSITY=3 make reboot-limit-baseline # Check individual node status ansible baseline:dev:service -m shell -a "cat /data/reboot-limit/*/reboot-count.txt" diff --git a/kconfigs/Kconfig.ansible_cfg b/kconfigs/Kconfig.ansible_cfg index e3fd02f1..bea093fe 100644 --- a/kconfigs/Kconfig.ansible_cfg +++ b/kconfigs/Kconfig.ansible_cfg @@ -172,6 +172,26 @@ config ANSIBLE_CFG_CALLBACK_PLUGIN_PROFILE_TASKS https://docs.ansible.com/ansible/latest/collections/ansible/posix/profile_tasks_callback.html endmenu +config ANSIBLE_CFG_VERBOSITY + int "Ansible verbosity level" + output yaml + range 0 6 + default 0 + help + Set the default verbosity level for Ansible output (0-6). + + Level 0: Normal output (only changes and errors) + Level 1: -v equivalent, shows task results + Level 2: -vv equivalent, shows task input + Level 3: -vvv equivalent, shows connection debug + Level 4-6: Increasingly verbose debugging information + + This sets the verbosity key in ansible.cfg [defaults] section. + Can be overridden at runtime via ANSIBLE_VERBOSITY environment + variable. + + https://docs.ansible.com/ansible/latest/reference_appendices/config.html#default-verbosity + config ANSIBLE_CFG_DEPRECATION_WARNINGS bool "deprecation_warnings" output yaml diff --git a/playbooks/roles/ansible_cfg/templates/ansible.cfg.j2 b/playbooks/roles/ansible_cfg/templates/ansible.cfg.j2 index deb1a559..165aec0e 100644 --- a/playbooks/roles/ansible_cfg/templates/ansible.cfg.j2 +++ b/playbooks/roles/ansible_cfg/templates/ansible.cfg.j2 @@ -2,6 +2,7 @@ {% if ansible_cfg_callback_plugin_profile_tasks %} callbacks_enabled = ansible.posix.profile_tasks, {{ ansible_cfg_callback_plugin_string }} {% endif %} +verbosity = {{ ansible_cfg_verbosity | default(0) }} deprecation_warnings = {{ ansible_cfg_deprecation_warnings }} stdout_callback = {{ ansible_cfg_callback_plugin_string }} check_mode_markers = {{ ansible_cfg_callback_plugin_check_mode_markers }} diff --git a/scripts/ansible.Makefile b/scripts/ansible.Makefile index 0ce8168f..4d2bc0c4 100644 --- a/scripts/ansible.Makefile +++ b/scripts/ansible.Makefile @@ -1,8 +1,5 @@ # SPDX-License-Identifier: copyleft-next-0.3.1 -AV ?= 0 -export ANSIBLE_VERBOSE := $(shell scripts/validate_av.py --av "$(AV)") - ansible-requirements: $(Q)ansible-galaxy install -r requirements.yml PHONY += ansible-requirements diff --git a/scripts/archive.Makefile b/scripts/archive.Makefile index 23a693d7..3356a9ff 100644 --- a/scripts/archive.Makefile +++ b/scripts/archive.Makefile @@ -13,7 +13,7 @@ ARCHIVE_DYNAMIC_RUNTIME_VARS += \ endif ci-archive: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/kdevops_archive.yml \ --extra-vars '{ $(ARCHIVE_DYNAMIC_RUNTIME_VARS) }' \ --extra-vars=@./extra_vars.yaml diff --git a/scripts/devconfig.Makefile b/scripts/devconfig.Makefile index db68dd18..3b368055 100644 --- a/scripts/devconfig.Makefile +++ b/scripts/devconfig.Makefile @@ -56,7 +56,7 @@ extend-extra-args-devconfig: PHONY += devconfig devconfig: $(KDEVOPS_NODES) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml \ --extra-vars="$(BOOTLINUX_ARGS)" \ --extra-vars '{ kdevops_cli_install: True }' \ @@ -70,7 +70,7 @@ HELP_TARGETS+=devconfig-generic-help-menu ifeq (y,$(CONFIG_SYSCTL_TUNING)) PHONY += sysctl-tunings sysctl-tunings: $(KDEVOPS_NODES) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml \ --extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS) --tags vars,sysctl diff --git a/scripts/dynamic-pci-kconfig.Makefile b/scripts/dynamic-pci-kconfig.Makefile index f4d71355..06dc7886 100644 --- a/scripts/dynamic-pci-kconfig.Makefile +++ b/scripts/dynamic-pci-kconfig.Makefile @@ -42,7 +42,7 @@ endif # CONFIG_KDEVOPS_LIBVIRT_PCIE_PASSTHROUGH HELP_TARGETS += dynamic-kconfig-pci-help dynamic_pcipassthrough_kconfig: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/gen-pci-kconfig.yml \ --extra-vars '{ $(PCIE_RUNTIME_VARS) }' diff --git a/scripts/firstconfig.Makefile b/scripts/firstconfig.Makefile index 4904afcc..94097cd7 100644 --- a/scripts/firstconfig.Makefile +++ b/scripts/firstconfig.Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: copyleft-next-0.3.1 firstconfig: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars '{ kdevops_cli_install: True }' \ --tags vars_simple,firstconfig \ $(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml diff --git a/scripts/guestfs.Makefile b/scripts/guestfs.Makefile index 205e3ce0..247d2846 100644 --- a/scripts/guestfs.Makefile +++ b/scripts/guestfs.Makefile @@ -52,39 +52,39 @@ KDEVOPS_PROVISION_DESTROY_METHOD := destroy_guestfs $(Q)make linux-clone libvirt_pcie_passthrough_permissions: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/libvirt_pcie_passthrough.yml $(KDEVOPS_PROVISIONED_SSH): $(Q)if [[ "$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE)" == "y" ]]; then \ - ansible-playbook $(ANSIBLE_VERBOSE) \ + ansible-playbook \ playbooks/update_ssh_config_guestfs.yml \ --extra-vars=@./extra_vars.yaml; \ LIBVIRT_DEFAULT_URI=$(CONFIG_LIBVIRT_URI) \ $(TOPDIR)/scripts/update_ssh_config_guestfs.py; \ fi - $(Q)ansible $(ANSIBLE_VERBOSE) 'baseline:dev:service' -m wait_for_connection + $(Q)ansible 'baseline:dev:service' -m wait_for_connection $(Q)touch $(KDEVOPS_PROVISIONED_SSH) install_libguestfs: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'localhost' \ playbooks/guestfs.yml \ --extra-vars=@./extra_vars.yaml \ --tags install-deps bringup_guestfs: $(GUESTFS_BRINGUP_DEPS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'localhost' \ $(KDEVOPS_PLAYBOOKS_DIR)/guestfs.yml \ --extra-vars=@./extra_vars.yaml \ --tags network,pool,base_image - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev:service:ai' \ playbooks/guestfs.yml \ --extra-vars=@./extra_vars.yaml \ --tags bringup - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'localhost' \ $(KDEVOPS_PLAYBOOKS_DIR)/guestfs.yml \ --extra-vars=@./extra_vars.yaml \ @@ -92,14 +92,14 @@ bringup_guestfs: $(GUESTFS_BRINGUP_DEPS) PHONY += bringup_guestfs status_guestfs: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/guestfs.yml \ --extra-vars=@./extra_vars.yaml \ --tags status PHONY += status_guestfs destroy_guestfs: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev:service' \ playbooks/guestfs.yml \ --extra-vars=@./extra_vars.yaml \ diff --git a/scripts/install-menuconfig-deps.Makefile b/scripts/install-menuconfig-deps.Makefile index 4b9aef8d..c16d0a5c 100644 --- a/scripts/install-menuconfig-deps.Makefile +++ b/scripts/install-menuconfig-deps.Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: copyleft-next-0.3.1 menuconfig-deps: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/install-menuconfig-deps.yml \ -e 'kdevops_first_run=True' PHONY += menuconfig-deps diff --git a/scripts/install-rcloud-deps.Makefile b/scripts/install-rcloud-deps.Makefile index 94489cdf..6d6235ed 100644 --- a/scripts/install-rcloud-deps.Makefile +++ b/scripts/install-rcloud-deps.Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: copyleft-next-0.3.1 rcloud-deps: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/install-rcloud-deps.yml \ -e 'kdevops_first_run=True' PHONY += rcloud-deps diff --git a/scripts/iscsi.Makefile b/scripts/iscsi.Makefile index a647c2b4..d6e42fc9 100644 --- a/scripts/iscsi.Makefile +++ b/scripts/iscsi.Makefile @@ -6,7 +6,7 @@ ISCSI_EXTRA_ARGS += kdevops_enable_iscsi=true ANSIBLE_EXTRA_ARGS += $(ISCSI_EXTRA_ARGS) iscsi: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars=@./extra_vars.yaml \ $(KDEVOPS_PLAYBOOKS_DIR)/iscsi.yml diff --git a/scripts/journal-server.Makefile b/scripts/journal-server.Makefile index d3c39712..b6ef1385 100644 --- a/scripts/journal-server.Makefile +++ b/scripts/journal-server.Makefile @@ -11,24 +11,24 @@ ANSIBLE_EXTRA_ARGS += devconfig_systemd_journal_use_http='True' endif journal-client: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ --extra-vars '{ kdevops_cli_install: True }' \ --tags vars_simple,journal \ $(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml journal-server: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_journal_remote.yml journal-restart: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ --tags vars_extra,journal-upload-restart \ $(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml journal-status: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ --tags vars_extra,journal-status \ $(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml @@ -41,7 +41,7 @@ journal-dump: journal-ln: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ --tags vars_extra,journal_ln \ $(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 76e4f5c3..f59df38c 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -73,7 +73,7 @@ help: @echo @echo "Variable options:" @echo "make V=n [targets] 1: verbose build (Makefile)" - @echo "make AV=n [targets] 0-6: verbose build (Ansible)" + @echo "ANSIBLE_VERBOSITY=n make [targets] 0-6: verbose build (Ansible)" .PHONY: clean clean: diff --git a/scripts/kotd.Makefile b/scripts/kotd.Makefile index c74aad5a..82dc8042 100644 --- a/scripts/kotd.Makefile +++ b/scripts/kotd.Makefile @@ -10,19 +10,19 @@ endif # HAVE_DISTRO_CUSTOM_KOTD_REPO ANSIBLE_CMD_KOTD_ENABLE := kotd: inventory .config - $(Q)$(ANSIBLE_CMD_KOTD_ENABLE)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)$(ANSIBLE_CMD_KOTD_ENABLE)ansible-playbook \ playbooks/devconfig.yml --tags vars,kotd \ --extra-vars=@./extra_vars.yaml kotd-baseline: inventory .config - $(Q)$(ANSIBLE_CMD_KOTD_ENABLE)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)$(ANSIBLE_CMD_KOTD_ENABLE)ansible-playbook \ --limit 'baseline' \ playbooks/devconfig.yml \ --tags vars,kotd \ --extra-vars=@./extra_vars.yaml kotd-dev: inventory .config - $(Q)$(ANSIBLE_CMD_KOTD_ENABLE)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)$(ANSIBLE_CMD_KOTD_ENABLE)ansible-playbook \ --limit 'dev' \ playbooks/devconfig.yml \ --tags vars,kotd \ diff --git a/scripts/krb5.Makefile b/scripts/krb5.Makefile index a414fc8b..0e42d42d 100644 --- a/scripts/krb5.Makefile +++ b/scripts/krb5.Makefile @@ -7,12 +7,12 @@ KRB5_EXTRA_ARGS += kdevops_krb5_enable=True ANSIBLE_EXTRA_ARGS += $(KRB5_EXTRA_ARGS) kdc: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars=@./extra_vars.yaml \ $(KDEVOPS_PLAYBOOKS_DIR)/kdc.yml krb5: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars=@./extra_vars.yaml \ $(KDEVOPS_PLAYBOOKS_DIR)/krb5.yml diff --git a/scripts/ktls.Makefile b/scripts/ktls.Makefile index 83a8dbe6..912c4189 100644 --- a/scripts/ktls.Makefile +++ b/scripts/ktls.Makefile @@ -1,7 +1,7 @@ ifeq (y,$(CONFIG_KDEVOPS_SETUP_KTLS)) ktls: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars=@./extra_vars.yaml \ $(KDEVOPS_PLAYBOOKS_DIR)/ktls.yml diff --git a/scripts/nfsd.Makefile b/scripts/nfsd.Makefile index 92933536..a97b1bd2 100644 --- a/scripts/nfsd.Makefile +++ b/scripts/nfsd.Makefile @@ -28,7 +28,7 @@ PHONY += extend-extra-args-nfsd ANSIBLE_EXTRA_ARGS += $(NFSD_EXTRA_ARGS) nfsd: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars=@./extra_vars.yaml \ $(KDEVOPS_PLAYBOOKS_DIR)/nfsd.yml diff --git a/scripts/nixos.Makefile b/scripts/nixos.Makefile index 7a88c527..1d8c4e47 100644 --- a/scripts/nixos.Makefile +++ b/scripts/nixos.Makefile @@ -42,7 +42,7 @@ KDEVOPS_PROVISION_DESTROY_METHOD := destroy_nixos $(Q)make linux-clone libvirt_pcie_passthrough_permissions: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/libvirt_pcie_passthrough.yml $(KDEVOPS_PROVISIONED_SSH): $(KDEVOPS_HOSTS_PREFIX) @@ -51,21 +51,21 @@ $(KDEVOPS_PROVISIONED_SSH): $(KDEVOPS_HOSTS_PREFIX) $(Q)touch $(KDEVOPS_PROVISIONED_SSH) install_nixos_deps: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'localhost' \ playbooks/nixos.yml \ --extra-vars=@./extra_vars.yaml \ --tags install-deps generate_nixos_configs: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'localhost' \ playbooks/nixos.yml \ --extra-vars=@./extra_vars.yaml \ --tags generate-configs bringup_nixos: $(NIXOS_BRINGUP_DEPS) generate_nixos_configs - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/nixos.yml \ --extra-vars=@./extra_vars.yaml \ --tags build-vms,bringup,console @@ -76,7 +76,7 @@ status_nixos: PHONY += status_nixos destroy_nixos: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/nixos.yml \ --extra-vars=@./extra_vars.yaml \ --tags destroy diff --git a/scripts/provision.Makefile b/scripts/provision.Makefile index b13d31e8..378cbde4 100644 --- a/scripts/provision.Makefile +++ b/scripts/provision.Makefile @@ -69,7 +69,7 @@ KDEVOPS_MRPROPER += $(KDEVOPS_PROVISIONED_DEVCONFIG) $(KDEVOPS_PROVISIONED_DEVCONFIG): $(Q)if [[ "$(CONFIG_KDEVOPS_ANSIBLE_PROVISION_PLAYBOOK)" != "" ]]; then \ - ansible-playbook $(ANSIBLE_VERBOSE) \ + ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/$(KDEVOPS_ANSIBLE_PROVISION_PLAYBOOK) ;\ fi $(Q)touch $(KDEVOPS_PROVISIONED_DEVCONFIG) diff --git a/scripts/rdma.Makefile b/scripts/rdma.Makefile index c63b63a7..db74c652 100644 --- a/scripts/rdma.Makefile +++ b/scripts/rdma.Makefile @@ -1,7 +1,7 @@ ifeq (y,$(CONFIG_KDEVOPS_SETUP_RDMA_SIW)) siw: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars=@./extra_vars.yaml \ $(KDEVOPS_PLAYBOOKS_DIR)/siw.yml @@ -14,7 +14,7 @@ endif ifeq (y,$(CONFIG_KDEVOPS_SETUP_RDMA_RXE)) rxe: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars=@./extra_vars.yaml \ $(KDEVOPS_PLAYBOOKS_DIR)/rxe.yml diff --git a/scripts/smbd.Makefile b/scripts/smbd.Makefile index 3101e978..88846fbe 100644 --- a/scripts/smbd.Makefile +++ b/scripts/smbd.Makefile @@ -8,7 +8,7 @@ SMBD_EXTRA_ARGS += kdevops_smbd_enable=True ANSIBLE_EXTRA_ARGS += $(SMBD_EXTRA_ARGS) smbd: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars=@./extra_vars.yaml \ $(KDEVOPS_PLAYBOOKS_DIR)/smbd.yml diff --git a/scripts/systemd-timesync.Makefile b/scripts/systemd-timesync.Makefile index 148bf173..c788ca0a 100644 --- a/scripts/systemd-timesync.Makefile +++ b/scripts/systemd-timesync.Makefile @@ -20,14 +20,14 @@ ANSIBLE_EXTRA_ARGS += devconfig_enable_systemd_timesyncd_ntp_google_debian='True endif timesyncd-client: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ --extra-vars '{ kdevops_cli_install: True }' \ --tags vars_simple,timesyncd \ $(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml timesyncd-server: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_timesyncd.yml timesyncd-status: diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index e18e12b6..363d6cf6 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -197,36 +197,36 @@ endif endif bringup_terraform: lambdalabs-ssh-check - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/terraform.yml --tags bringup \ --extra-vars=@./extra_vars.yaml $(KDEVOPS_PROVISIONED_SSH): - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/terraform.yml --tags ssh \ --extra-vars=@./extra_vars.yaml - $(Q)ansible $(ANSIBLE_VERBOSE) \ + $(Q)ansible \ baseline:dev:service \ -m wait_for_connection $(Q)touch $(KDEVOPS_PROVISIONED_SSH) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ -i hosts playbooks/extra_volumes.yml \ --extra-vars=@./extra_vars.yaml status_terraform: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/terraform.yml --tags status \ --extra-vars=@./extra_vars.yaml destroy_terraform: destroy_terraform_base lambdalabs-ssh-clean-after destroy_terraform_base: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/terraform.yml --tags destroy \ --extra-vars=@./extra_vars.yaml $(Q)rm -f $(KDEVOPS_PROVISIONED_SSH) $(KDEVOPS_PROVISIONED_DEVCONFIG) $(KDEVOPS_TFVARS): $(KDEVOPS_TFVARS_TEMPLATE) .config - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(KDEVOPS_PLAYBOOKS_DIR)/gen_tfvars.yml \ --extra-vars=@./extra_vars.yaml diff --git a/scripts/update_etc_hosts.Makefile b/scripts/update_etc_hosts.Makefile index 5fb90e98..774d36c6 100644 --- a/scripts/update_etc_hosts.Makefile +++ b/scripts/update_etc_hosts.Makefile @@ -1,5 +1,5 @@ update_etc_hosts: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/update_etc_hosts.yml KDEVOPS_BRING_UP_DEPS_EARLY += update_etc_hosts diff --git a/scripts/validate_av.py b/scripts/validate_av.py deleted file mode 100755 index fffb836f..00000000 --- a/scripts/validate_av.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python3 -# SPDX-License-Identifier: copyleft-next-0.3.1 - -import argparse - - -def get_ansible_verbosity(av: str, max_level: int = 6) -> str: - """Return Ansible verbosity flag (e.g. -vv or emtpy).""" - try: - av = int(av) - except ValueError: - return "" - av = max(0, min(av, max_level)) - return "-" + "v" * av if av > 0 else "" - - -def main(): - parser = argparse.ArgumentParser( - description="Validate and return Ansible verbosity level." - ) - parser.add_argument("--av", type=str, default="0", help="Verbosity level (0-6)") - - args = parser.parse_args() - print(get_ansible_verbosity(args.av)) - - -if __name__ == "__main__": - main() diff --git a/workflows/ai/Makefile b/workflows/ai/Makefile index b5fca977..90c809ed 100644 --- a/workflows/ai/Makefile +++ b/workflows/ai/Makefile @@ -30,7 +30,7 @@ export AI_ARGS_SEPARATED := $(subst $(space),$(comma),$(AI_ARGS)) # Main AI workflow targets ai: $(KDEVOPS_NODES) $(ANSIBLE_INVENTORY_FILE) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/ai.yml \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ --extra-vars="$(AI_ARGS) $(AI_MANUAL_ARGS)" \ @@ -44,7 +44,7 @@ ai-dev: # AI Testing/Benchmark targets ai-tests: $(KDEVOPS_NODES) $(ANSIBLE_INVENTORY_FILE) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/ai_tests.yml \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ --extra-vars="$(AI_ARGS) $(AI_MANUAL_ARGS)" \ @@ -52,7 +52,7 @@ ai-tests: $(KDEVOPS_NODES) $(ANSIBLE_INVENTORY_FILE) $(Q)$(MAKE) ai-results ai-tests-baseline: $(KDEVOPS_NODES) $(ANSIBLE_INVENTORY_FILE) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ -l baseline \ playbooks/ai_tests.yml \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ @@ -60,7 +60,7 @@ ai-tests-baseline: $(KDEVOPS_NODES) $(ANSIBLE_INVENTORY_FILE) $(Q)$(MAKE) ai-results-baseline ai-tests-dev: $(KDEVOPS_NODES) $(ANSIBLE_INVENTORY_FILE) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ -l dev \ playbooks/ai_tests.yml \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ @@ -69,7 +69,7 @@ ai-tests-dev: $(KDEVOPS_NODES) $(ANSIBLE_INVENTORY_FILE) # Target to only run results analysis and graph generation ai-tests-results: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/ai_tests.yml \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ --extra-vars="$(AI_ARGS) $(AI_MANUAL_ARGS)" \ @@ -78,7 +78,7 @@ ai-tests-results: # Results collection targets ai-results: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/ai_results.yml \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ --extra-vars="$(AI_ARGS) $(AI_MANUAL_ARGS)" \ @@ -91,26 +91,26 @@ ai-results-dev: $(Q)$(MAKE) ai-results HOSTS="dev" monitor-results: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/monitor-results.yml \ --extra-vars=@./extra_vars.yaml ai-setup: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/ai_setup.yml \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ --extra-vars="$(AI_ARGS) $(AI_MANUAL_ARGS)" \ $(LIMIT_HOSTS) ai-uninstall: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/ai_uninstall.yml \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ --extra-vars="$(AI_ARGS) $(AI_MANUAL_ARGS)" \ $(LIMIT_HOSTS) ai-destroy: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/ai_destroy.yml \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ --extra-vars="$(AI_ARGS) $(AI_MANUAL_ARGS)" \ diff --git a/workflows/blktests/Makefile b/workflows/blktests/Makefile index 047aba3b..4bfbf8e7 100644 --- a/workflows/blktests/Makefile +++ b/workflows/blktests/Makefile @@ -57,12 +57,12 @@ extend-extra-args-blktests: fi blktests: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/blktests.yml \ --skip-tags run_tests,copy_results $(LIMIT_HOSTS) blktests-baseline: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ playbooks/blktests.yml \ --tags vars,run_tests,copy_results \ @@ -71,7 +71,7 @@ blktests-baseline: blktests-baseline-skip-kdevops-update: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ playbooks/blktests.yml \ --tags vars,run_tests,copy_results --skip-tags git_update \ @@ -79,7 +79,7 @@ blktests-baseline-skip-kdevops-update: --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS) blktests-baseline-run-oscheck-only: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ playbooks/blktests.yml \ --tags vars,run_tests,copy_results \ @@ -88,7 +88,7 @@ blktests-baseline-run-oscheck-only: --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS) blktests-dev: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'dev' \ playbooks/blktests.yml \ --tags vars,run_tests,copy_results \ @@ -96,7 +96,7 @@ blktests-dev: --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS) blktests-baseline-results: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ playbooks/blktests.yml \ --tags copy_results,print_results \ @@ -106,7 +106,7 @@ blktests-baseline-results: blktests-results: blktests-baseline-results blktests-dev-results: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'dev' \ playbooks/blktests.yml \ --tags copy_results,print_results \ @@ -114,7 +114,7 @@ blktests-dev-results: --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS) monitor-results: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/monitor-results.yml \ --extra-vars=@./extra_vars.yaml \ $(LIMIT_HOSTS) diff --git a/workflows/build-linux/Makefile b/workflows/build-linux/Makefile index d19c3854..cf375a60 100644 --- a/workflows/build-linux/Makefile +++ b/workflows/build-linux/Makefile @@ -4,7 +4,7 @@ PHONY += monitor-results monitor-kill # Main build-linux workflow targets build-linux: $(KDEVOPS_NODES) $(ANSIBLE_INVENTORY_FILE) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ -i hosts \ playbooks/build_linux.yml \ -f 10 \ @@ -23,7 +23,7 @@ build-linux-dev: # Results collection target build-linux-results: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ -i hosts \ playbooks/build_linux_results.yml \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ @@ -65,12 +65,12 @@ build-linux-visualize: exit 1) monitor-results: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/monitor-results.yml \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) monitor-kill: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ -i hosts \ playbooks/monitor-kill.yml \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ diff --git a/workflows/common/Makefile b/workflows/common/Makefile index 9ae0a0a9..ef9e45f4 100644 --- a/workflows/common/Makefile +++ b/workflows/common/Makefile @@ -37,7 +37,7 @@ 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) \ + $(Q)ansible-playbook \ playbooks/common.yml --tags vars,kdevops_reset \ --extra-vars '{ kdevops_git_reset: True }' $(LIMIT_HOSTS) diff --git a/workflows/cxl/Makefile b/workflows/cxl/Makefile index 6d7894a9..0c4a939e 100644 --- a/workflows/cxl/Makefile +++ b/workflows/cxl/Makefile @@ -17,42 +17,42 @@ BOOTLINUX_CXL_HELP := include $(TOPDIR)/workflows/cxl/Makefile.kernel cxl: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/cxl.yml \ --skip-tags run_tests,copy_results \ $(LIMIT_HOSTS) cxl-test-probe: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ 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) \ + $(Q)ansible-playbook \ 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) \ + $(Q)ansible-playbook \ playbooks/cxl.yml \ --tags vars,copy_results $(LIMIT_HOSTS) cxl-mem-setup: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/cxl.yml \ --tags vars,extra-vars,cxl-mem-setup $(LIMIT_HOSTS) cxl-create-dc-region: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/cxl.yml \ --tags vars,cxl-create-dc-region $(LIMIT_HOSTS) cxl-dcd-setup: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/cxl.yml \ --tags vars,cxl-dcd-setup $(LIMIT_HOSTS) diff --git a/workflows/demos/reboot-limit/Makefile b/workflows/demos/reboot-limit/Makefile index 680eed88..3db8ad53 100644 --- a/workflows/demos/reboot-limit/Makefile +++ b/workflows/demos/reboot-limit/Makefile @@ -121,7 +121,7 @@ endif # CONFIG_REBOOT_LIMIT_ENABLE_LOOP # The playbook reboot-limit.yml is used to run all tasks defined except those # with tags "run_tests" or "copy_results". reboot-limit: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/reboot-limit.yml \ --skip-tags run_tests,copy_results \ --extra-vars="reboot_limit_max=$(REBOOT_LIMIT_MAX)" @@ -152,13 +152,13 @@ reboot-limit: $(KDEVOPS_EXTRA_VARS) # use the vars tag to ensure we get variables defined which we construct on the # fly. reboot-limit-baseline: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ playbooks/reboot-limit.yml \ --tags vars,first_run,reset \ --extra-vars=@./extra_vars.yaml \ --extra-vars="reboot_limit_max=$(REBOOT_LIMIT_MAX)" - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ playbooks/reboot-limit.yml \ --tags vars,run_tests,copy_results \ @@ -178,7 +178,7 @@ reboot-limit-baseline-kotd: # Resets the boot counters so we start from scratch reboot-limit-baseline-reset: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ playbooks/reboot-limit.yml \ --tags vars,reset \ @@ -191,13 +191,13 @@ reboot-limit-tests: reboot-limit-baseline reboot-limit-dev # Check if dev group has hosts before running reboot-limit-dev: $(KDEVOPS_EXTRA_VARS) $(Q)if grep -A1 '^\[dev\]' hosts | grep -qE '^[a-zA-Z0-9]'; then \ - ansible-playbook $(ANSIBLE_VERBOSE) \ + ansible-playbook \ --limit 'dev' \ playbooks/reboot-limit.yml \ --tags vars,first_run,reset \ --extra-vars=@./extra_vars.yaml \ --extra-vars="reboot_limit_max=$(REBOOT_LIMIT_MAX)" && \ - ansible-playbook $(ANSIBLE_VERBOSE) \ + ansible-playbook \ --limit 'dev' \ playbooks/reboot-limit.yml \ --tags vars,run_tests,copy_results \ @@ -214,7 +214,7 @@ reboot-limit-dev-kotd: $(Q)$(REBOOT_LIMIT_LOOP_KOTD) dev reboot-limit-dev-reset: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'dev' \ playbooks/reboot-limit.yml \ --tags vars,reset \ diff --git a/workflows/fio-tests/Makefile b/workflows/fio-tests/Makefile index 218cfbfc..30ac2ea6 100644 --- a/workflows/fio-tests/Makefile +++ b/workflows/fio-tests/Makefile @@ -1,37 +1,37 @@ fio-tests: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ playbooks/fio-tests.yml \ $(LIMIT_HOSTS) fio-tests-baseline: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ playbooks/fio-tests-baseline.yml \ $(LIMIT_HOSTS) fio-tests-results: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ playbooks/fio-tests.yml \ --tags results \ $(LIMIT_HOSTS) fio-tests-graph: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ playbooks/fio-tests-graph.yml \ $(LIMIT_HOSTS) fio-tests-compare: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ playbooks/fio-tests-compare.yml \ $(LIMIT_HOSTS) fio-tests-trend-analysis: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ playbooks/fio-tests-trend-analysis.yml \ $(LIMIT_HOSTS) diff --git a/workflows/fstests/Makefile b/workflows/fstests/Makefile index ef6347ac..4de28a20 100644 --- a/workflows/fstests/Makefile +++ b/workflows/fstests/Makefile @@ -129,20 +129,20 @@ endif endif fstests: $(FSTESTS_BASELINE_EXTRA) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'localhost:baseline:dev' \ 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) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ playbooks/fstests.yml \ --tags vars,kdevops_fstests_setup,gendisks \ $(LIMIT_HOSTS) fstests-baseline: $(FSTESTS_BASELINE_EXTRA) - $(Q)PYTHONUNBUFFERED=1 ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)PYTHONUNBUFFERED=1 ansible-playbook \ --limit 'baseline' \ playbooks/fstests.yml \ --tags vars,run_tests,copy_results \ @@ -150,7 +150,7 @@ fstests-baseline: $(FSTESTS_BASELINE_EXTRA) --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS) fstests-baseline-skip-kdevops-update: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ playbooks/fstests.yml \ --tags run_tests,copy_results \ @@ -161,7 +161,7 @@ fstests-baseline-skip-kdevops-update: $(KDEVOPS_EXTRA_VARS) $(LIMIT_HOSTS) fstests-baseline-run-oscheck-only: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ playbooks/fstests.yml \ --tags run_tests,copy_results \ @@ -172,7 +172,7 @@ fstests-baseline-run-oscheck-only: $(KDEVOPS_EXTRA_VARS) $(LIMIT_HOSTS) fstests-config: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ playbooks/fstests.yml \ --tags vars,generate-fstests-config \ @@ -180,14 +180,14 @@ fstests-config: $(KDEVOPS_EXTRA_VARS) $(LIMIT_HOSTS) fstests-config-debug: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/fstests.yml \ -e 'fstests_debug_localhost=True' \ --tags vars,generate-fstests-config \ --extra-vars=@./extra_vars.yaml fstests-dev: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'dev' \ playbooks/fstests.yml \ --tags vars,run_tests,copy_results \ @@ -196,7 +196,7 @@ fstests-dev: $(KDEVOPS_EXTRA_VARS) --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS) fstests-tests: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ playbooks/fstests.yml \ --tags vars,run_tests,copy_results \ @@ -205,7 +205,7 @@ fstests-tests: $(KDEVOPS_EXTRA_VARS) --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS) fstests-baseline-results-tfb-ls: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ playbooks/fstests.yml \ --tags vars,tfb \ @@ -215,7 +215,7 @@ fstests-baseline-results-tfb-ls: $(KDEVOPS_EXTRA_VARS) --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS) fstests-baseline-results-tfb-trim: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ playbooks/fstests.yml \ --tags vars,tfb \ @@ -225,7 +225,7 @@ fstests-baseline-results-tfb-trim: $(KDEVOPS_EXTRA_VARS) --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS) fstests-baseline-results: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ playbooks/fstests.yml \ --tags copy_results,print_results,tfb \ @@ -236,7 +236,7 @@ fstests-baseline-results: $(KDEVOPS_EXTRA_VARS) fstests-results: fstests-baseline-results fstests-dev-results: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'dev' \ playbooks/fstests.yml \ --tags copy_results,print_results \ @@ -245,7 +245,7 @@ fstests-dev-results: $(KDEVOPS_EXTRA_VARS) $(LIMIT_HOSTS) monitor-results: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/monitor-results.yml \ --extra-vars=@./extra_vars.yaml \ $(LIMIT_HOSTS) diff --git a/workflows/gitr/Makefile b/workflows/gitr/Makefile index b1b7fe37..ad2fcefb 100644 --- a/workflows/gitr/Makefile +++ b/workflows/gitr/Makefile @@ -79,13 +79,13 @@ XARGS_ARGS := -I {} bash -c 'echo "{}:"; cat {}; echo;' endif gitr: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ --skip-tags run_tests,run_specific_tests,copy_results \ $(KDEVOPS_PLAYBOOKS_DIR)/gitr.yml gitr-baseline: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ --tags $(GITR_PLAY_TAGS) \ --extra-vars=@./extra_vars.yaml \ @@ -93,7 +93,7 @@ gitr-baseline: gitr-dev-baseline: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'dev' \ --tags $(GITR_PLAY_TAGS) \ --extra-vars=@./extra_vars.yaml \ @@ -101,7 +101,7 @@ gitr-dev-baseline: gitr-dev-reset: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'dev' \ --tags vars,reset \ --extra-vars=@./extra_vars.yaml \ diff --git a/workflows/linux/Makefile b/workflows/linux/Makefile index 5cbf92ca..a6b8f2ea 100644 --- a/workflows/linux/Makefile +++ b/workflows/linux/Makefile @@ -111,14 +111,14 @@ ifeq (y,$(CONFIG_BOOTLINUX_AB_DIFFERENT_REF)) linux: linux-baseline linux-dev else linux: $(KDEVOPS_NODES) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit '$(BOOTLINUX_LIMIT)' \ $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \ --extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS) endif else linux: $(KDEVOPS_NODES) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit '$(BOOTLINUX_LIMIT)' \ $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \ --extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS) @@ -127,7 +127,7 @@ endif PHONY += linux-baseline ifeq (y,$(CONFIG_KDEVOPS_BASELINE_AND_DEV)) linux-baseline: $(KDEVOPS_NODES) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit baseline \ $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \ --extra-vars="$(BOOTLINUX_ARGS)" @@ -140,7 +140,7 @@ endif PHONY += linux-dev ifeq (y,$(CONFIG_KDEVOPS_BASELINE_AND_DEV)) linux-dev: $(KDEVOPS_NODES) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit dev \ $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \ --extra-vars="$(BOOTLINUX_ARGS)" @@ -152,7 +152,7 @@ endif PHONY += linux-mount linux-mount: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit '$(BOOTLINUX_LIMIT)' \ $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \ --tags vars,9p_mount \ @@ -160,7 +160,7 @@ linux-mount: PHONY += linux-deploy linux-deploy: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit '$(BOOTLINUX_LIMIT)' \ $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \ --tags vars,build-linux,install-linux,manual-update-grub,saved,vars,reboot \ @@ -168,7 +168,7 @@ linux-deploy: PHONY += linux-build linux-build: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit '$(BOOTLINUX_LIMIT)' \ $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \ --tags vars,build-linux,saved,vars \ @@ -176,7 +176,7 @@ linux-build: PHONY += linux-install linux-install: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit '$(BOOTLINUX_LIMIT)' \ $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \ --tags vars,build-linux,install-linux \ @@ -184,7 +184,7 @@ linux-install: PHONY += linux-uninstall linux-uninstall: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit '$(BOOTLINUX_LIMIT)' \ $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \ --tags uninstall-linux,vars \ @@ -192,7 +192,7 @@ linux-uninstall: $(LIMIT_HOSTS) linux-clone-clients: $(KDEVOPS_NODES) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit '$(BOOTLINUX_LIMIT)' \ $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \ --extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS) \ @@ -200,7 +200,7 @@ linux-clone-clients: $(KDEVOPS_NODES) PHONY += linux-clone-9p linux-clone-9p: $(KDEVOPS_NODES) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'localhost' \ $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \ --extra-vars="$(BOOTLINUX_ARGS)" \ @@ -211,14 +211,14 @@ linux-clone: $(KDEVOPS_NODES) $(LINUX_CLONE_DEFAULT_TYPE) PHONY += linux-grub-setup linux-grub-setup: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit '$(BOOTLINUX_LIMIT)' \ $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \ --extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS) --tags manual-update-grub,saved,vars PHONY += linux-reboot linux-reboot: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit '$(BOOTLINUX_LIMIT)' \ $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \ --extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS) --tags vars,reboot @@ -232,7 +232,7 @@ uname: ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_CXL)) PHONY += linux-cxl linux-cxl: $(KDEVOPS_NODES) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit '$(BOOTLINUX_LIMIT)' \ $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \ --tags 'vars,cxl-build,cxl-install' \ diff --git a/workflows/ltp/Makefile b/workflows/ltp/Makefile index 592c4f2b..4510e849 100644 --- a/workflows/ltp/Makefile +++ b/workflows/ltp/Makefile @@ -105,13 +105,13 @@ XARGS_ARGS := -I {} bash -c 'echo "{}:"; cat {}; echo;' endif ltp: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ --skip-tags run_tests,copy_results \ $(KDEVOPS_PLAYBOOKS_DIR)/ltp.yml ltp-baseline: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ --tags vars,run_tests,copy_results \ --extra-vars=@./extra_vars.yaml \ @@ -119,7 +119,7 @@ ltp-baseline: ltp-dev-baseline: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'dev' \ --tags vars,run_tests,copy_results \ --extra-vars=@./extra_vars.yaml \ @@ -127,7 +127,7 @@ ltp-dev-baseline: ltp-dev-reset: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'dev' \ --tags vars,reset \ --extra-vars=@./extra_vars.yaml \ diff --git a/workflows/minio/Makefile b/workflows/minio/Makefile index 69c3c687..6344256f 100644 --- a/workflows/minio/Makefile +++ b/workflows/minio/Makefile @@ -14,25 +14,25 @@ $(MINIO_DATA_TARGET): $(ANSIBLE_INVENTORY_FILE) $(Q)$(MAKE) $(MINIO_DATA_TARGET_INSTALL) $(MINIO_DATA_TARGET_INSTALL): $(ANSIBLE_INVENTORY_FILE) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(MINIO_PLAYBOOK) \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ --tags vars,minio_install $(MINIO_DATA_TARGET_UNINSTALL): $(ANSIBLE_INVENTORY_FILE) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(MINIO_PLAYBOOK) \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ --tags vars,minio_uninstall $(MINIO_DATA_TARGET_DESTROY): $(ANSIBLE_INVENTORY_FILE) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(MINIO_PLAYBOOK) \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ --tags vars,minio_destroy $(MINIO_DATA_TARGET_RUN): $(ANSIBLE_INVENTORY_FILE) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ $(MINIO_PLAYBOOK) \ --extra-vars=@$(KDEVOPS_EXTRA_VARS) \ --tags vars,minio_warp @@ -51,7 +51,7 @@ $(MINIO_DATA_TARGET_RESULTS): fi $(MINIO_DATA_TARGET_MONITOR): $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/monitor-results.yml \ --extra-vars=@./extra_vars.yaml diff --git a/workflows/mmtests/Makefile b/workflows/mmtests/Makefile index c6248b95..712ce70d 100644 --- a/workflows/mmtests/Makefile +++ b/workflows/mmtests/Makefile @@ -2,55 +2,55 @@ MMTESTS_ARGS := mmtests: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/mmtests.yml \ --extra-vars=@./extra_vars.yaml \ --tags deps,setup $(MMTESTS_ARGS) mmtests-baseline: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ -l 'mmtests:&baseline' playbooks/mmtests.yml \ --extra-vars=@./extra_vars.yaml \ --tags run_tests \ $(MMTESTS_ARGS) mmtests-dev: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ -l 'mmtests:&dev' playbooks/mmtests.yml \ --extra-vars=@./extra_vars.yaml \ --tags run_tests \ $(MMTESTS_ARGS) mmtests-tests: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/mmtests.yml \ --extra-vars=@./extra_vars.yaml \ --tags run_tests,results \ $(MMTESTS_ARGS) mmtests-results: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/mmtests.yml \ --extra-vars=@./extra_vars.yaml \ --tags results \ $(MMTESTS_ARGS) mmtests-compare: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/mmtests-compare.yml \ --extra-vars=@./extra_vars.yaml \ --tags deps,compare \ $(MMTESTS_ARGS) monitor-results: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/monitor-results.yml \ --extra-vars=@./extra_vars.yaml \ $(MMTESTS_ARGS) mmtests-clean: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/mmtests.yml \ --extra-vars=@./extra_vars.yaml \ --tags clean \ diff --git a/workflows/nfstest/Makefile b/workflows/nfstest/Makefile index 4bd8e147..2842a10d 100644 --- a/workflows/nfstest/Makefile +++ b/workflows/nfstest/Makefile @@ -62,13 +62,13 @@ XARGS_ARGS := -I {} bash -c 'echo "{}:"; cat {}; echo;' endif nfstest: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ --skip-tags run_tests,copy_results \ $(KDEVOPS_PLAYBOOKS_DIR)/nfstest.yml nfstest-baseline: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ --tags vars,run_tests,copy_results \ --extra-vars=@./extra_vars.yaml \ @@ -76,7 +76,7 @@ nfstest-baseline: nfstest-dev-baseline: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'dev' \ --tags vars,run_tests,copy_results \ --extra-vars=@./extra_vars.yaml \ @@ -84,7 +84,7 @@ nfstest-dev-baseline: nfstest-dev-reset: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'dev' \ --tags vars,reset \ --extra-vars=@./extra_vars.yaml \ diff --git a/workflows/pynfs/Makefile b/workflows/pynfs/Makefile index 29b0feac..df808e25 100644 --- a/workflows/pynfs/Makefile +++ b/workflows/pynfs/Makefile @@ -32,18 +32,18 @@ endif # Makefile for pynfs targets pynfs: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ --skip-tags run_tests,copy_results,clean_local_results \ $(KDEVOPS_PLAYBOOKS_DIR)/pynfs.yml pynfs-baseline: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ --tags vars,first_run,reset \ --extra-vars=@./extra_vars.yaml \ $(KDEVOPS_PLAYBOOKS_DIR)/pynfs.yml - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ --tags vars,run_tests,copy_results \ --extra-vars=@./extra_vars.yaml \ @@ -52,12 +52,12 @@ pynfs-baseline: # Below are the corresponding dev targets pynfs-dev-baseline: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'dev' \ --tags vars,first_run,reset \ --extra-vars=@./extra_vars.yaml \ $(KDEVOPS_PLAYBOOKS_DIR)/pynfs.yml - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'dev' \ --tags vars,run_tests,copy_results \ --extra-vars=@./extra_vars.yaml \ @@ -65,7 +65,7 @@ pynfs-dev-baseline: pynfs-dev-reset: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'dev' \ --tags vars,reset \ --extra-vars=@./extra_vars.yaml \ diff --git a/workflows/rcloud/Makefile b/workflows/rcloud/Makefile index 14f99679..dddee161 100644 --- a/workflows/rcloud/Makefile +++ b/workflows/rcloud/Makefile @@ -54,7 +54,7 @@ rcloud-build: $(RCLOUD_WORKFLOW)/target/release/rcloud $(RCLOUD_DEPS) # Create base images with proper customization (networking, SSH, users, etc.) rcloud-base-images: @echo "Creating base images with virt-builder customization..." - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'localhost' \ --extra-vars=@./extra_vars.yaml \ --tags network,pool,base_image \ @@ -64,7 +64,7 @@ rcloud-base-images: # Install rcloud (copy binary, setup systemd service, install Terraform provider) rcloud: rcloud-build rcloud-base-images @echo "Installing rcloud..." - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --extra-vars=@./extra_vars.yaml \ -i inventory/hosts \ playbooks/rcloud.yml diff --git a/workflows/selftests/Makefile b/workflows/selftests/Makefile index b040647e..2dd3a495 100644 --- a/workflows/selftests/Makefile +++ b/workflows/selftests/Makefile @@ -29,26 +29,26 @@ include $(TOPDIR)/workflows/selftests/tests/Makefile.sysctl include $(TOPDIR)/workflows/selftests/tests/Makefile.xarray selftests: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/selftests.yml \ --skip-tags run_tests,copy_results,check_results \ $(LIMIT_HOSTS) selftests-baseline: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit '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) \ + $(Q)ansible-playbook \ --limit 'baseline' \ playbooks/selftests.yml \ --tags vars,copy_results,check_results $(LIMIT_HOSTS) selftests-check-results: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline' \ playbooks/selftests.yml \ --tags vars,check_results $(LIMIT_HOSTS) diff --git a/workflows/steady_state/Makefile b/workflows/steady_state/Makefile index 66a48011..f6342088 100644 --- a/workflows/steady_state/Makefile +++ b/workflows/steady_state/Makefile @@ -7,22 +7,22 @@ PHONY += steady-state-help-menu SSD_STEADY_STATE_DYNAMIC_RUNTIME_VARS := "kdevops_run_ssd_steady_state": True steady-state-files: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/steady_state.yml \ --extra-vars=@./extra_vars.yaml --tags vars,setup $(LIMIT_HOSTS) steady-state-prefill: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/steady_state.yml \ --extra-vars=@./extra_vars.yaml --tags vars,prefill $(LIMIT_HOSTS) steady-state-run: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/steady_state.yml \ --extra-vars=@./extra_vars.yaml --tags vars,steady_state $(LIMIT_HOSTS) steady-state: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/steady_state.yml \ --extra-vars '{ $(SSD_STEADY_STATE_DYNAMIC_RUNTIME_VARS) }' $(LIMIT_HOSTS) diff --git a/workflows/sysbench/Makefile b/workflows/sysbench/Makefile index eb4ffc4a..442bd0d5 100644 --- a/workflows/sysbench/Makefile +++ b/workflows/sysbench/Makefile @@ -25,46 +25,46 @@ TAGS_SYSBENCH_RESULTS += results # Target to set up sysbench (MySQL or PostgreSQL) sysbench: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/sysbench.yml \ --skip-tags $(subst $(space),$(comma),$(TAGS_SYSBENCH_RUN)) # Target to run sysbench tests (including telemetry) sysbench-test: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/sysbench.yml \ --tags $(subst $(space),$(comma),$(TAGS_SYSBENCH_TEST)) # Optional target to collect telemetry sysbench-telemetry: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/sysbench.yml \ --tags $(subst $(space),$(comma),$(TAGS_SYSBENCH_TELEMETRY)) # Optional target to collect all results sysbench-results: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/sysbench.yml \ --tags $(subst $(space),$(comma),$(TAGS_SYSBENCH_RESULTS)) monitor-results: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/monitor-results.yml \ --extra-vars=@./extra_vars.yaml sysbench-clean: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/sysbench.yml \ --tags vars,clean # Optional in case you want to improve graphing sysbench-plot: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/sysbench.yml \ --tags vars,plot monitor-results: $(KDEVOPS_EXTRA_VARS) - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ playbooks/monitor-results.yml \ --extra-vars=@./extra_vars.yaml \ $(LIMIT_HOSTS) diff --git a/workflows/vllm/Makefile b/workflows/vllm/Makefile index caed2e8a..2bbe8e55 100644 --- a/workflows/vllm/Makefile +++ b/workflows/vllm/Makefile @@ -3,49 +3,49 @@ HELP_TARGETS += vllm-help-menu vllm: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ playbooks/vllm.yml \ --tags data_partition,vars,deps,docker-config,vllm-deploy \ --extra-vars=@./extra_vars.yaml vllm-deploy: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ playbooks/vllm.yml \ --tags data_partition,vars,deps,docker-config,vllm-deploy \ --extra-vars=@./extra_vars.yaml vllm-benchmark: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ playbooks/vllm.yml \ --tags vars,vllm-benchmark \ --extra-vars=@./extra_vars.yaml vllm-monitor: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ playbooks/vllm.yml \ --tags vars,vllm-monitor \ --extra-vars=@./extra_vars.yaml vllm-teardown: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ playbooks/vllm.yml \ --tags vars,vllm-teardown \ --extra-vars=@./extra_vars.yaml vllm-cleanup: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ playbooks/vllm.yml \ --tags vars,vllm-cleanup \ --extra-vars=@./extra_vars.yaml vllm-cleanup-full: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ playbooks/vllm.yml \ --tags vars,vllm-cleanup \ @@ -53,7 +53,7 @@ vllm-cleanup-full: --extra-vars='{"vllm_cleanup_remove_binaries": true}' vllm-cleanup-purge: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ playbooks/vllm.yml \ --tags vars,vllm-cleanup \ @@ -61,14 +61,14 @@ vllm-cleanup-purge: --extra-vars='{"vllm_cleanup_remove_binaries": true, "vllm_cleanup_remove_data": true}' vllm-results: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ playbooks/vllm.yml \ --tags vars,vllm-results,vllm-visualize \ --extra-vars=@./extra_vars.yaml vllm-visualize-results: - $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ + $(Q)ansible-playbook \ --limit 'baseline:dev' \ playbooks/vllm.yml \ --tags vars,vllm-visualize \ -- 2.52.0