Skip to content

Commit 09a0b28

Browse files
committed
[reproducer] Merge extra_variable_files into reproducer-variables.yml for PreMetal
PreMetal provisions hosts from the main branch, generating reproducer-variables.yml with base scenario vars. During the actual Zuul job, overwrite_zuul_vars.yml only merges zuul_vars.yaml into reproducer-variables.yml, ignoring extra_variable_files entirely. This means any scenario override passed via extra_variable_files is silently lost on the controller. The base values from PreMetal provisioning win, causing jobs to run the wrong test plan. Iteratively merge each extra_variable_files entry into reproducer-variables.yml before the zuul_vars.yaml merge, preserving the correct precedence: base < extra_variable_files < zuul_vars. Signed-off-by: Samuel Rac <srac@redhat.com>
1 parent 21dbd39 commit 09a0b28

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

roles/reproducer/tasks/overwrite_zuul_vars.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,18 @@
4040
dest: /usr/local/bin/merge_yaml_override
4141
mode: "0755"
4242

43+
- name: Merge extra variable files into reproducer-variables.yml
44+
when: extra_variable_files is defined
45+
ansible.builtin.shell: >
46+
python3 /usr/local/bin/merge_yaml_override
47+
{{ temp_reproducer_var_path }}
48+
{{ item }} >
49+
{{ temp_merged_reproducer_var_path }} &&
50+
cp {{ temp_merged_reproducer_var_path }}
51+
{{ temp_reproducer_var_path }}
52+
loop: "{{ extra_variable_files }}"
53+
no_log: "{{ cifmw_nolog | default(true) | bool }}"
54+
4355
- name: Execute merge script
4456
ansible.builtin.shell: >
4557
python3 /usr/local/bin/merge_yaml_override

0 commit comments

Comments
 (0)