fstests: Fix DYNAMIC_RUNTIME_VARS use on CIs runs

Running 'make fstests-baseline' on CIs is proving we don't get
dynamic variable set in particular kdevops_run_fstests. To fix
this correct the syntax and quoting of --extra-vars when
invoking ansible.

Signed-off-by: Luis Chamberlain <[email protected]>

Author: mcgrof

playbooks/roles/fstests/tasks/main.yml

@@ -14,6 +14,9 @@
     name: create_data_partition
   tags: [ 'oscheck', 'data_partition' ]
 
+- debug:
+    msg: "kdevops_run_fstests is {{ kdevops_run_fstests }}"
+
 # Distro specific
 - name: Install dependencies
   include_tasks: install-deps/main.yml

workflows/fstests/Makefile

@@ -80,9 +80,9 @@ FSTEST_KERNEL_CI_LOOP := scripts/workflows/fstests/run_kernel_ci.sh
 FSTEST_KERNEL_CI_LOOP_KOTD := scripts/workflows/fstests/run_kernel_ci_kotd.sh
 endif # CONFIG_KERNEL_CI
 
-DYNAMIC_RUNTIME_VARS := "kdevops_run_fstests": True
+DYNAMIC_RUNTIME_VARS := '"kdevops_run_fstests": True'
 ifneq (,$(RUN_FAILURES))
-DYNAMIC_RUNTIME_VARS += , "run_tests_on_failures": True
+DYNAMIC_RUNTIME_VARS += ', "run_tests_on_failures": True'
 endif
 
 ifneq (,$(SKIP_RUN))
@@ -129,7 +129,7 @@ fstests-baseline: $(FSTESTS_BASELINE_EXTRA)
 	$(Q)PYTHONUNBUFFERED=1 ansible-playbook $(ANSIBLE_VERBOSE) \
 		-f 30 -i hosts -l baseline playbooks/fstests.yml \
 		--tags vars,run_tests,copy_results \
-		--extra-vars '{ $(DYNAMIC_RUNTIME_VARS) }' \
+		--extra-vars $(DYNAMIC_RUNTIME_VARS) \
 		--extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
 
 fstests-baseline-loop: $(KDEVOPS_EXTRA_VARS)
@@ -143,8 +143,7 @@ fstests-baseline-skip-kdevops-update: $(KDEVOPS_EXTRA_VARS)
 		-f 30 -i hosts -l baseline playbooks/fstests.yml \
 		--tags run_tests,copy_results \
 		--skip-tags git_update \
-		--extra-vars \
-		'{ $(DYNAMIC_RUNTIME_VARS) }' \
+		--extra-vars $(DYNAMIC_RUNTIME_VARS) \
 		--extra-vars=@./extra_vars.yaml \
 		$(LIMIT_HOSTS)
 
@@ -153,8 +152,7 @@ fstests-baseline-run-oscheck-only: $(KDEVOPS_EXTRA_VARS)
 		-f 30 -i hosts -l baseline playbooks/fstests.yml \
 		--tags run_tests,copy_results \
 		--skip-tags git_update,reboot,clean_results \
-		--extra-vars \
-		'{ $(DYNAMIC_RUNTIME_VARS) }' \
+		--extra-vars $(DYNAMIC_RUNTIME_VARS) \
 		--extra-vars=@./extra_vars.yaml \
 		$(LIMIT_HOSTS)
 
@@ -178,8 +176,7 @@ fstests-dev: $(KDEVOPS_EXTRA_VARS)
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		-f 30 -i hosts -l dev playbooks/fstests.yml \
 		--tags vars,run_tests,copy_results \
-		--extra-vars \
-		'{ $(DYNAMIC_RUNTIME_VARS) }' \
+		--extra-vars $(DYNAMIC_RUNTIME_VARS) \
 		--extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
 
 fstests-baseline-results-tfb-ls: $(KDEVOPS_EXTRA_VARS)