add OS CPU arch info

Signed-off-by: dw035535 <diane.wang@broadcom.com>

Author: Tomorrow9

common/get_guest_system_info.yml

@@ -21,6 +21,7 @@
   vars:
     gos_info_filter:
       - 'ansible_architecture'
+      - 'ansible_architecture2'
       - 'ansible_distribution*'
       - 'ansible_kernel'
       - 'ansible_os_family'
@@ -36,6 +37,7 @@
     guest_os_ansible_distribution: "{{ guest_system_info.ansible_distribution | default('') }}"
     guest_os_ansible_system: "{{ guest_system_info.ansible_system | default('') | lower }}"
     guest_os_ansible_architecture: "{{ guest_system_info.ansible_architecture | default('') }}"
+    guest_os_ansible_architecture2: "{{ guest_system_info.ansible_architecture2 | default('') }}"
     guest_os_ansible_distribution_ver: "{{ guest_system_info.ansible_distribution_version if guest_system_info.ansible_distribution != 'FreeBSD' else guest_system_info.ansible_kernel }}"
     guest_os_ansible_distribution_major_ver: "{{ guest_system_info.ansible_distribution_major_version if 'ansible_distribution_major_version' in guest_system_info else guest_system_info.ansible_distribution_release.split('-')[0].split('.')[0] }}"
     guest_os_ansible_distribution_minor_ver: |-

windows/check_os_fullname/check_vm_guest_info.yml

@@ -14,7 +14,11 @@
 # Set expected guest ID corresponding to current OS
 - name: "Set fact of expected guest ID of current {{ guest_os_ansible_architecture }} OS"
   ansible.builtin.set_fact:
-    current_os_guest_id: "{{ (guest_os_ansible_architecture == '64-bit' | ternary(current_gos_info.win_guest_id | select('match', '.*64Guest'), current_gos_info.win_guest_id | reject('match', '.*64Guest')))[0] }}"
+    current_os_guest_id: >-
+      {%- if guest_os_ansible_architecture == '32-bit' -%}{{ (current_gos_info.win_guest_id | reject('match', '.*64Guest'))[0] }}
+      {%- elif guest_os_ansible_cpu_arch == 'x86' -%}
+      {%- elif guest_os_ansible_cpu_arch == 'arm' -%}
+      {%- endif -%}
 
 - name: "Get the previous OS info in the pre-defined guest OS info list"
   include_tasks: get_previous_gos_info.yml

windows/utils/get_windows_system_info.yml

@@ -51,12 +51,21 @@
     guest_os_ansible_distribution: >-
       {{ (guest_os_ansible_distribution | regex_search('Microsoft Windows( Server)? ([0-9]+) (R2 )?')).strip() }}
 
+- name: "Set Windows guest OS CPU architecture"
+  ansible.builtin.set_fact:
+    guest_os_ansible_cpu_arch: >-
+      {%- if guest_os_ansible_architecture2 in ['x86_64', 'amd64', 'i386'] -%}x86
+      {%- elif guest_os_ansible_architecture2 == 'aarch64'-%}arm
+      {%- endif -%}
+
 - name: "Print Windows guest OS information"
   ansible.builtin.debug:
     msg:
       - "Guest OS: {{ guest_os_ansible_distribution }}"
       - "Guest OS type: {{ guest_os_ansible_system }}"
       - "Guest OS arch: {{ guest_os_ansible_architecture }}"
+      - "Guest OS arch2: {{ guest_os_ansible_architecture2 }}"
+      - "Guest OS CPU arch: {{ guest_os_ansible_cpu_arch }}"
       - "Guest OS major version: {{ guest_os_ansible_distribution_major_ver }}"
       - "Guest OS minor version: {{ guest_os_ansible_distribution_minor_ver }}"
       - "Guest OS version: {{ guest_os_ansible_distribution_ver }}"