From 03b4a7e953635ce6152ca9a9fed466736577a863 Mon Sep 17 00:00:00 2001 From: pavel Date: Fri, 24 Oct 2025 22:12:33 +0300 Subject: [PATCH] 2212 --- files/ansible-playbooks/sot-updater.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/files/ansible-playbooks/sot-updater.yml b/files/ansible-playbooks/sot-updater.yml index 37449f7..b970e14 100644 --- a/files/ansible-playbooks/sot-updater.yml +++ b/files/ansible-playbooks/sot-updater.yml @@ -462,16 +462,30 @@ failed_when: false ignore_errors: true - - name: Dev2 | Choose firmux line (prefer containing 'rev NNNN') - when: tunnel_ok | default(false) + # Show what we got from DEV2 so parsing is debuggable + - name: Dev2 | Debug raw firmux + when: dev2_firmux is defined + delegate_to: localhost + debug: + msg: + - "DEV2 firmux raw: {{ (dev2_firmux.stdout | default('') | trim) | regex_replace('\n',' | ') }}" + + # Build the list of firmux lines (CRLF-safe) + - name: Dev2 | Build firmux lines list delegate_to: localhost set_fact: _firmux_lines: "{{ (dev2_firmux.stdout | default('') | regex_replace('\r','')) | split('\n') | map('trim') | list }}" + + # Choose the line (prefer one with 'rev NNNN'); fall back to first non-empty + - name: Dev2 | Choose firmux line (prefer containing 'rev NNNN') + delegate_to: localhost + set_fact: dev2_line: >- {{ (_firmux_lines | select('match','(?i).*\\brev\\s*\\d+.*') | list | first) - | default((_firmux_lines | select('truthy') | list | first) | default('')) + | default((_firmux_lines | select('truthy') | list | first) | default('')) }} + - name: Dev2 | Normalize to EXACT 'X.X.X rev YYYY' (lowercase 'rev', single space) when: tunnel_ok | default(false)