Skip to content

Commit e98b58b

Browse files
mcgrofmcgrof
committed
workflows: use dynamic DYNAMIC_RUNTIME_VARS
Commit 02fcda1 ("CI: add archive support") made the mistake to borrow DYNAMIC_RUNTIME_VARS and reset it without checking other users, so we reset DYNAMIC_RUNTIME_VARS on other workflows which would stop the tests from actually starting. Fix this. Fixes: 02fcda1 ("CI: add archive support") Signed-off-by: Luis Chamberlain <[email protected]>
1 parent 9385003 commit e98b58b

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

‎scripts/archive.Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
ifeq (,$(wildcard $(CURDIR)/.config))
66
else
77

8-
DYNAMIC_RUNTIME_VARS :=
8+
ARCHIVE_DYNAMIC_RUNTIME_VARS :=
99

1010
ifneq (,$(DEMO))
11-
DYNAMIC_RUNTIME_VARS += \
11+
ARCHIVE_DYNAMIC_RUNTIME_VARS += \
1212
"kdevops_archive_demo": True
1313
endif
1414

@@ -17,6 +17,6 @@ ci-archive:
1717
--inventory localhost, \
1818
playbooks/kdevops_archive.yml \
1919
-e 'ansible_python_interpreter=/usr/bin/python3' \
20-
--extra-vars '{ $(DYNAMIC_RUNTIME_VARS) }' \
20+
--extra-vars '{ $(ARCHIVE_DYNAMIC_RUNTIME_VARS) }' \
2121
--extra-vars=@./extra_vars.yaml
2222
endif

‎workflows/blktests/Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ endif # CONFIG_KERNEL_CI
5151

5252
EXTRA_VAR_INPUTS += extend-extra-args-blktests
5353

54-
DYNAMIC_RUNTIME_VARS := "kdevops_run_blktests": True
54+
BLKTESTS_DYNAMIC_RUNTIME_VARS := "kdevops_run_blktests": True
5555
ifneq (,$(RUN_FAILURES))
56-
DYNAMIC_RUNTIME_VARS += , "run_tests_on_failures": True
56+
BLKTESTS_DYNAMIC_RUNTIME_VARS += , "run_tests_on_failures": True
5757
endif
5858

5959
ifneq (,$(SKIP_RUN))
60-
DYNAMIC_RUNTIME_VARS += , "blktests_skip_run": True
60+
BLKTESTS_DYNAMIC_RUNTIME_VARS += , "blktests_skip_run": True
6161
endif
6262

6363
extend-extra-args-blktests:
@@ -71,7 +71,7 @@ blktests:
7171

7272
blktests-baseline:
7373
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
74-
-f 30 -i hosts -l baseline playbooks/blktests.yml --tags run_tests,copy_results --extra-vars '{ $(DYNAMIC_RUNTIME_VARS) }' --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
74+
-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)
7575

7676
blktests-baseline-loop:
7777
$(Q)$(BLKTEST_KERNEL_CI_LOOP) baseline $(LIMIT_HOSTS)
@@ -81,15 +81,15 @@ blktests-baseline-kernelci:
8181

8282
blktests-baseline-skip-kdevops-update:
8383
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
84-
-f 30 -i hosts -l baseline playbooks/blktests.yml --tags run_tests,copy_results --skip-tags git_update --extra-vars '{ $(DYNAMIC_RUNTIME_VARS) }' --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
84+
-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)
8585

8686
blktests-baseline-run-oscheck-only:
8787
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
88-
-f 30 -i hosts -l baseline playbooks/blktests.yml --tags run_tests,copy_results --skip-tags git_update,reboot,clean_results --extra-vars '{ $(DYNAMIC_RUNTIME_VARS) }' --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
88+
-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)
8989

9090
blktests-dev:
9191
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
92-
-f 30 -i hosts -l dev playbooks/blktests.yml --tags run_tests,copy_results --extra-vars '{ $(DYNAMIC_RUNTIME_VARS) }' --extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
92+
-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)
9393

9494
blktests-baseline-results:
9595
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \

‎workflows/cxl/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ifeq (y,$(CONFIG_QEMU_ENABLE_CXL_DEMO_DCD_TOPOLOGY_1))
1212
CXL_ARGS += kdevops_qmp_str=$(CONFIG_QEMU_QMP_COMMAND_LINE_STRING)
1313
endif
1414

15-
DYNAMIC_RUNTIME_VARS := "kdevops_run_cxl_tests": $(CONFIG_ENABLE_CXL_TEST)
15+
CXL_DYNAMIC_RUNTIME_VARS := "kdevops_run_cxl_tests": $(CONFIG_ENABLE_CXL_TEST)
1616
WORKFLOW_ARGS += $(CXL_ARGS)
1717
BOOTLINUX_CXL_HELP :=
1818

@@ -28,14 +28,14 @@ cxl-test-probe:
2828
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
2929
-f 30 -i hosts playbooks/cxl.yml \
3030
--tags vars,cxl-test-prep,cxl-test-probe \
31-
--extra-vars '{ $(DYNAMIC_RUNTIME_VARS) }' \
31+
--extra-vars '{ $(CXL_DYNAMIC_RUNTIME_VARS) }' \
3232
$(LIMIT_HOSTS)
3333

3434
cxl-test-meson:
3535
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
3636
-f 30 -i hosts playbooks/cxl.yml \
3737
--tags vars,cxl-test-prep,cxl-test-meson \
38-
--extra-vars '{ $(DYNAMIC_RUNTIME_VARS) }' \
38+
--extra-vars '{ $(CXL_DYNAMIC_RUNTIME_VARS) }' \
3939
$(LIMIT_HOSTS)
4040

4141
cxl-results:

‎workflows/fstests/Makefile‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,39 +80,39 @@ FSTEST_KERNEL_CI_LOOP := scripts/workflows/fstests/run_kernel_ci.sh
8080
FSTEST_KERNEL_CI_LOOP_KOTD := scripts/workflows/fstests/run_kernel_ci_kotd.sh
8181
endif # CONFIG_KERNEL_CI
8282

83-
DYNAMIC_RUNTIME_VARS := "kdevops_run_fstests": True
83+
FSTESTS_DYNAMIC_RUNTIME_VARS := "kdevops_run_fstests": True
8484
ifneq (,$(RUN_FAILURES))
85-
DYNAMIC_RUNTIME_VARS += , "run_tests_on_failures": True
85+
FSTESTS_DYNAMIC_RUNTIME_VARS += , "run_tests_on_failures": True
8686
endif
8787

8888
ifneq (,$(SKIP_RUN))
89-
DYNAMIC_RUNTIME_VARS += , "fstests_skip_run": True
89+
FSTESTS_DYNAMIC_RUNTIME_VARS += , "fstests_skip_run": True
9090
endif
9191

9292
ifeq (y,$(CONFIG_FSTESTS_ENABLE_JOURNAL))
93-
DYNAMIC_RUNTIME_VARS += , "fstests_journal": True
93+
FSTESTS_DYNAMIC_RUNTIME_VARS += , "fstests_journal": True
9494
endif
9595

9696
ifneq (,$(INITIAL_BASELINE))
97-
DYNAMIC_RUNTIME_VARS += , "fstests_initial_baseline": True
97+
FSTESTS_DYNAMIC_RUNTIME_VARS += , "fstests_initial_baseline": True
9898
endif
9999

100100
ifneq (,$(START_AFTER))
101-
DYNAMIC_RUNTIME_VARS += , "fstests_start_after": True
102-
DYNAMIC_RUNTIME_VARS += , "fstests_start_after_test": "$(START_AFTER)"
101+
FSTESTS_DYNAMIC_RUNTIME_VARS += , "fstests_start_after": True
102+
FSTESTS_DYNAMIC_RUNTIME_VARS += , "fstests_start_after_test": "$(START_AFTER)"
103103
endif
104104

105105
ifneq (,$(SKIP_TESTS))
106-
DYNAMIC_RUNTIME_VARS += , "fstests_skip_tests_enable": True
107-
DYNAMIC_RUNTIME_VARS += , "fstests_skip_tests": "$(SKIP_TESTS)"
106+
FSTESTS_DYNAMIC_RUNTIME_VARS += , "fstests_skip_tests_enable": True
107+
FSTESTS_DYNAMIC_RUNTIME_VARS += , "fstests_skip_tests": "$(SKIP_TESTS)"
108108
endif
109109

110110
ifeq (y,$(CONFIG_DEVCONFIG_ENABLE_SYSTEMD_JOURNAL_REMOTE))
111111
FSTESTS_BASELINE_EXTRA += journal-ln
112112
endif
113113

114114
ifneq (,$(COUNT))
115-
DYNAMIC_RUNTIME_VARS += , "oscheck_extra_args": "-I $(COUNT)"
115+
FSTESTS_DYNAMIC_RUNTIME_VARS += , "oscheck_extra_args": "-I $(COUNT)"
116116
endif
117117

118118
fstests: $(FSTESTS_BASELINE_EXTRA)
@@ -129,7 +129,7 @@ fstests-baseline: $(FSTESTS_BASELINE_EXTRA)
129129
$(Q)PYTHONUNBUFFERED=1 ansible-playbook $(ANSIBLE_VERBOSE) \
130130
-f 30 -i hosts -l baseline playbooks/fstests.yml \
131131
--tags vars,run_tests,copy_results \
132-
--extra-vars '{ $(DYNAMIC_RUNTIME_VARS) }' \
132+
--extra-vars '{ $(FSTESTS_DYNAMIC_RUNTIME_VARS) }' \
133133
--extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
134134

135135
fstests-baseline-loop: $(KDEVOPS_EXTRA_VARS)
@@ -144,7 +144,7 @@ fstests-baseline-skip-kdevops-update: $(KDEVOPS_EXTRA_VARS)
144144
--tags run_tests,copy_results \
145145
--skip-tags git_update \
146146
--extra-vars \
147-
'{ $(DYNAMIC_RUNTIME_VARS) }' \
147+
'{ $(FSTESTS_DYNAMIC_RUNTIME_VARS) }' \
148148
--extra-vars=@./extra_vars.yaml \
149149
$(LIMIT_HOSTS)
150150

@@ -154,7 +154,7 @@ fstests-baseline-run-oscheck-only: $(KDEVOPS_EXTRA_VARS)
154154
--tags run_tests,copy_results \
155155
--skip-tags git_update,reboot,clean_results \
156156
--extra-vars \
157-
'{ $(DYNAMIC_RUNTIME_VARS) }' \
157+
'{ $(FSTESTS_DYNAMIC_RUNTIME_VARS) }' \
158158
--extra-vars=@./extra_vars.yaml \
159159
$(LIMIT_HOSTS)
160160

@@ -179,7 +179,7 @@ fstests-dev: $(KDEVOPS_EXTRA_VARS)
179179
-f 30 -i hosts -l dev playbooks/fstests.yml \
180180
--tags vars,run_tests,copy_results \
181181
--extra-vars \
182-
'{ $(DYNAMIC_RUNTIME_VARS) }' \
182+
'{ $(FSTESTS_DYNAMIC_RUNTIME_VARS) }' \
183183
--extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
184184

185185
fstests-baseline-results-tfb-ls: $(KDEVOPS_EXTRA_VARS)

‎workflows/linux/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ BOOTLINUX_ARGS += bootlinux_9p_mount_tag='$(subst ",,$(CONFIG_BOOTLINUX_9P_MOUNT
5252
LINUX_CLONE_DEFAULT_TYPE := linux-clone-9p
5353
endif
5454

55-
# XXX: I can't seem to use after this DYNAMIC_RUNTIME_VARS += for other
55+
# XXX: I can't seem to use after this LINUX_DYNAMIC_RUNTIME_VARS += for other
5656
# future dynamic run time variables. So figure how the hell to do that
5757
# so we can enable other dynamic variables for other make targets other
5858
# than uninstall. For now this does it for us.
@@ -61,7 +61,7 @@ endif
6161
#
6262
# We use override as other subsystems may use this too.
6363
ifneq (,$(KVER))
64-
override DYNAMIC_RUNTIME_VARS = "uninstall_kernel_ver": "$(KVER)"
64+
override LINUX_DYNAMIC_RUNTIME_VARS = "uninstall_kernel_ver": "$(KVER)"
6565
endif
6666

6767
BOOTLINUX_ARGS += bootlinux_cxl_test=$(CONFIG_ENABLE_CXL_TEST)
@@ -124,7 +124,7 @@ linux-uninstall:
124124
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i \
125125
$(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
126126
--tags uninstall-linux,vars \
127-
--extra-vars '{ "uninstall_kernel_enable": "True", $(DYNAMIC_RUNTIME_VARS) }' \
127+
--extra-vars '{ "uninstall_kernel_enable": "True", $(LINUX_DYNAMIC_RUNTIME_VARS) }' \
128128
$(LIMIT_HOSTS)
129129

130130
linux-clone-clients: $(KDEVOPS_NODES)

‎workflows/selftests/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ ifeq (y,$(CONFIG_WORKFLOWS_DEDICATED_WORKFLOW))
66
export KDEVOPS_HOSTS_TEMPLATE := selftests.j2
77
endif
88

9-
DYNAMIC_RUNTIME_VARS := "kdevops_run_selftests": True
9+
SELFTESTS_DYNAMIC_RUNTIME_VARS := "kdevops_run_selftests": True
1010

1111
ifneq (,$(SKIP_RUN))
12-
DYNAMIC_RUNTIME_VARS += , "selftests_skip_run": True
12+
SELFTESTS_DYNAMIC_RUNTIME_VARS += , "selftests_skip_run": True
1313
endif
1414

1515
ifneq (,$(SKIP_REBOOT))
16-
DYNAMIC_RUNTIME_VARS += , "selftests_skip_reboot": True
16+
SELFTESTS_DYNAMIC_RUNTIME_VARS += , "selftests_skip_reboot": True
1717
endif
1818

1919
SELFTESTS_HELP_TARGETS := selftests-help-main
@@ -39,7 +39,7 @@ selftests:
3939
selftests-baseline:
4040
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
4141
-f 30 -i hosts -l baseline playbooks/selftests.yml \
42-
--extra-vars '{ $(DYNAMIC_RUNTIME_VARS) }' \
42+
--extra-vars '{ $(SELFTESTS_DYNAMIC_RUNTIME_VARS) }' \
4343
--tags vars,run_tests,copy_results,check_results $(LIMIT_HOSTS)
4444

4545
selftests-results:

0 commit comments

Comments
 (0)