This commit is contained in:
2025-11-05 20:09:35 +02:00
parent f4fbda3488
commit 7a99d4a10c

View File

@@ -640,33 +640,34 @@
msg: "DEV2 firmux={{ (dev2_firmux.stdout | default('')) | trim }}" msg: "DEV2 firmux={{ (dev2_firmux.stdout | default('')) | trim }}"
# ====== INSERTED: two-step normalization preview (rev->r, then space->dash) ====== # ====== INSERTED: two-step normalization preview (rev->r, then space->dash) ======
- name: Normalize DEV2 firmux (step 1): replace 'rev ' -> 'r' (debug only) - name: "Normalize DEV2 firmux (step 1): replace 'rev ' -> 'r' (debug only)"
when: dev2_firmux is defined when: dev2_firmux is defined
delegate_to: localhost delegate_to: localhost
ansible.builtin.set_fact: ansible.builtin.set_fact:
_firmux_step1: "{{ (dev2_firmux.stdout | default('') | trim) | regex_replace('(?i)rev\\s+','r') }}" _firmux_step1: "{{ (dev2_firmux.stdout | default('') | trim) | regex_replace('(?i)rev\\s+','r') }}"
changed_when: false changed_when: false
- name: Debug firmux after step 1 (rev->r) - name: "Debug firmux after step 1 (rev->r)"
when: _firmux_step1 is defined when: _firmux_step1 is defined
delegate_to: localhost delegate_to: localhost
ansible.builtin.debug: ansible.builtin.debug:
msg: "_firmux_step1={{ _firmux_step1 }}" msg: "_firmux_step1={{ _firmux_step1 }}"
- name: Normalize DEV2 firmux (step 2): replace space -> '-' (debug only) - name: "Normalize DEV2 firmux (step 2): replace space -> '-' (debug only)"
when: _firmux_step1 is defined when: _firmux_step1 is defined
delegate_to: localhost delegate_to: localhost
ansible.builtin.set_fact: ansible.builtin.set_fact:
_firmux_step2: "{{ _firmux_step1 | replace(' ', '-') }}" _firmux_step2: "{{ _firmux_step1 | replace(' ', '-') }}"
changed_when: false changed_when: false
- name: Debug firmux after step 2 (space->dash) - name: "Debug firmux after step 2 (space->dash)"
when: _firmux_step2 is defined when: _firmux_step2 is defined
delegate_to: localhost delegate_to: localhost
ansible.builtin.debug: ansible.builtin.debug:
msg: "_firmux_step2={{ _firmux_step2 }}" msg: "_firmux_step2={{ _firmux_step2 }}"
# ====== END INSERTED ====== # ====== END INSERTED ======
# ===================== Early equality/substring check (same logic as checker) ===================== # ===================== Early equality/substring check (same logic as checker) =====================
# 1) expected_norm from image_filename (prefer extracted X.Y.Z-rNNNN) # 1) expected_norm from image_filename (prefer extracted X.Y.Z-rNNNN)
- name: Normalize expected target step one compute base string (from image_filename) - name: Normalize expected target step one compute base string (from image_filename)