Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions roles/reproducer/tasks/overwrite_zuul_vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@
dest: /usr/local/bin/merge_yaml_override
mode: "0755"

- name: DEBUG - top-level keys in reproducer-variables.yml before any merge
ansible.builtin.shell: >
grep -oE '^[A-Za-z0-9_]+:' {{ temp_reproducer_var_path }} | sort -u
changed_when: false
register: _debug_keys_pre_merge

- name: DEBUG - print pre-merge keys
ansible.builtin.debug:
var: _debug_keys_pre_merge.stdout_lines

- name: Execute merge script
ansible.builtin.shell: >
python3 /usr/local/bin/merge_yaml_override
Expand All @@ -42,6 +52,12 @@
{{ temp_merged_reproducer_var_path }}
no_log: "{{ cifmw_nolog | default(true) | bool }}"

- name: DEBUG - print extra_variable_files received by this process
ansible.builtin.debug:
msg: >-
extra_variable_files is
{{ 'defined: ' ~ extra_variable_files if extra_variable_files is defined else 'NOT defined' }}

- name: Merge extra variable files into reproducer-variables.yml
when: extra_variable_files is defined
ansible.builtin.shell: >
Expand All @@ -57,6 +73,30 @@
label: "{{ extra_variable_file | basename }}"
no_log: "{{ cifmw_nolog | default(true) | bool }}"

- name: DEBUG - top-level keys in reproducer-variables.yml after all merges
ansible.builtin.shell: >
grep -oE '^[A-Za-z0-9_]+:' {{ temp_merged_reproducer_var_path }} | sort -u
changed_when: false
register: _debug_keys_post_merge

- name: DEBUG - print post-merge keys
ansible.builtin.debug:
var: _debug_keys_post_merge.stdout_lines

- name: DEBUG - keys added or touched by the merge
ansible.builtin.shell: >
comm -13
<(echo "{{ _debug_keys_pre_merge.stdout_lines | join('\n') }}")
<(echo "{{ _debug_keys_post_merge.stdout_lines | join('\n') }}")
args:
executable: /bin/bash
changed_when: false
register: _debug_keys_new

- name: DEBUG - print new/changed top-level keys
ansible.builtin.debug:
var: _debug_keys_new.stdout_lines

- name: Write back merged reproducer-variables.yml
ansible.builtin.copy:
src: "{{ temp_merged_reproducer_var_path }}"
Expand Down
Loading