From 6115f83b7ed3b66b878e0f80fc8f2abb8ab14171 Mon Sep 17 00:00:00 2001 From: Michael Burke Date: Mon, 6 Jul 2026 15:36:52 +0000 Subject: [PATCH] DNM: trace extra_variable_files merge for premetal a set of debug changes to check an extra variable files change Generated-By: Claude Sonnet 5 Signed-off-by: Michael Burke --- .../reproducer/tasks/overwrite_zuul_vars.yml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/roles/reproducer/tasks/overwrite_zuul_vars.yml b/roles/reproducer/tasks/overwrite_zuul_vars.yml index c67032dc4..ae0d63ec7 100644 --- a/roles/reproducer/tasks/overwrite_zuul_vars.yml +++ b/roles/reproducer/tasks/overwrite_zuul_vars.yml @@ -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 @@ -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: > @@ -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 }}"