pavel/ansible-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1647

Browse Source
This commit is contained in:
pavel
2026-02-12 16:47:54 +02:00
parent 77781011c1
commit 03e32a3fe1
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
files/ansible-playbooks/afterupgrade_check.yml
View File

@@ -37,6 +37,14 @@
target_version: "{{ target_version | default('') }}" target_version: "{{ target_version | default('') }}"
# preserve the original string verbatim for all subsequent retries # preserve the original string verbatim for all subsequent retries
target_version_full: "{{ target_version | default('') }}" target_version_full: "{{ target_version | default('') }}"
is_run_by_effective: "{{ is_run_by | default('manual') }}"
- name: Debug is_run_by mode
ansible.builtin.debug:
msg:
- "is_run_by={{ is_run_by | default('UNSET') }}"
- "is_run_by_effective={{ is_run_by_effective }}"
- name: Derive effective target version (avoid extra-var masking) - name: Derive effective target version (avoid extra-var masking)
ansible.builtin.set_fact: ansible.builtin.set_fact:

1
files/ansible-playbooks/update-rebootin224.yml
View File

@@ -793,6 +793,7 @@
correlation_id: "{{ au_correlation_id }}" correlation_id: "{{ au_correlation_id }}"
original_emitted_at: "{{ au_original_emitted_at }}" original_emitted_at: "{{ au_original_emitted_at }}"
schema_version: 1 schema_version: 1
is_run_by: "{{ is_run_by_effective }}"
when: nbq2_payload_obj is defined when: nbq2_payload_obj is defined
delegate_to: localhost delegate_to: localhost

2
files/rabbit-client.sh
View File

@@ -78,6 +78,7 @@ dispatch_task() {
target_ver="$(jq -r '.target_version // ""' <<<"$json")" target_ver="$(jq -r '.target_version // ""' <<<"$json")"
tv_full="$(jq -r '.target_version_full // ""' <<<"$json")" tv_full="$(jq -r '.target_version_full // ""' <<<"$json")"
schema="$(jq -r '.schema_version // ""' <<<"$json")" schema="$(jq -r '.schema_version // ""' <<<"$json")"
is_run_by="$(jq -r '.is_run_by // ""' <<<"$json")"
# Backfill target_version from target_version_full if missing (e.g., fox200-2.2.1-r6801.bin → 2.2.1-r6801) # Backfill target_version from target_version_full if missing (e.g., fox200-2.2.1-r6801.bin → 2.2.1-r6801)
if [[ -z "$target_ver" && -n "$tv_full" ]]; then if [[ -z "$target_ver" && -n "$tv_full" ]]; then
@@ -96,6 +97,7 @@ dispatch_task() {
task_options+=" -e target_version='$(esc "$target_ver")'" task_options+=" -e target_version='$(esc "$target_ver")'"
task_options+=" -e target_version_full='$(esc "$tv_full")'" task_options+=" -e target_version_full='$(esc "$tv_full")'"
task_options+=" -e schema_version='$(esc "$schema")'" task_options+=" -e schema_version='$(esc "$schema")'"
task_options+=" -e is_run_by='$(esc "$is_run_by")'"
fi fi