Merge pull request #3914 from priti-parate/pub/q1_dev

Merge pub/q1_dev to pub/build_stream

Author: priti-parate

README.md

@@ -23,7 +23,7 @@ Omnia 1.x Documentation is hosted on [Read The Docs 1.x](https://omnia-doc.readt
 
 Omnia 2.x Documentation is hosted on [Read The Docs 2.x](https://omnia.readthedocs.io/en/latest/index.html).
 
-Current Status: ![GitHub](https://readthedocs.org/projects/omnia-doc/badge/?version=latest)
+Current Status: ![GitHub](https://readthedocs.org/projects/omnia/badge/?version=latest)
 
 ## Licensing
 

build_image_aarch64/roles/fetch_packages/tasks/fetch_packages.yml

@@ -1,4 +1,4 @@
-# Copyright 2025 Dell Inc. or its subsidiaries. All Rights Reserved.
+# Copyright 2026 Dell Inc. or its subsidiaries. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,21 +13,20 @@
 # limitations under the License.
 ---
 
-- name: Fetch aarch64 default_packages.json software packages
+- name: Fetch aarch64 default_packages.json and additional_packages.json software packages
   when: fg_aarch64
   block:
-    - name: Load default_packages.json
-      ansible.builtin.include_vars:
-        file: "{{ default_json_path }}"
-        name: default_packages_json
+    - name: Collect base image RPM packages (default + additional + admin_debug)
+      base_image_package_collector:
+        default_json_path: "{{ default_json_path }}"
+        additional_json_path: "{{ additional_json_path | default('') }}"
+        admin_debug_json_path: "{{ admin_debug_json_path | default('') }}"
+        software_config_path: "{{ software_config_file_path }}"
+      register: base_image_output
 
-    - name: Extract rpm packages
+    - name: Set x86_64_base_image_packages
       ansible.builtin.set_fact:
-        aarch64_base_image_packages: >-
-          {{ default_packages_json.default_packages.cluster
-            | selectattr('type', 'equalto', 'rpm')
-            | map(attribute='package')
-            | list }}
+        x86_64_base_image_packages: "{{ base_image_output.base_image_packages }}"
 
     - name: Debug package aarch64_base_image_packages
       ansible.builtin.debug:

build_image_aarch64/roles/fetch_packages/tasks/main.yml

@@ -1,4 +1,4 @@
-# Copyright 2025 Dell Inc. or its subsidiaries. All Rights Reserved.
+# Copyright 2026 Dell Inc. or its subsidiaries. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -33,9 +33,12 @@
     file: "{{ software_config_file_path }}"
     name: software_config
 
-- name: Set cluster_os_version as rhel_tag variable
+- name: Set cluster OS facts
   ansible.builtin.set_fact:
     rhel_tag: "{{ software_config.cluster_os_version }}"
+    default_json_path: "{{ input_project_dir }}/config/aarch64/{{ software_config.cluster_os_type }}/{{ software_config.cluster_os_version }}/default_packages.json"  # noqa: yaml[line-length]
+    additional_json_path: "{{ input_project_dir }}/config/aarch64/{{ software_config.cluster_os_type }}/{{ software_config.cluster_os_version }}/additional_packages.json"  # noqa: yaml[line-length]
+    admin_debug_json_path: "{{ input_project_dir }}/config/aarch64/{{ software_config.cluster_os_type }}/{{ software_config.cluster_os_version }}/admin_debug_packages.json"  # noqa: yaml[line-length]
 
 - name: Fetch pulp endpoint repos
   ansible.builtin.include_tasks: fetch_pulp_repos.yml

build_image_aarch64/roles/fetch_packages/vars/main.yml

@@ -1,4 +1,4 @@
-# Copyright 2025 Dell Inc. or its subsidiaries. All Rights Reserved.
+# Copyright 2026 Dell Inc. or its subsidiaries. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ local_repo_check_msg: |
 input_project_dir: "{{ hostvars['localhost']['input_project_dir'] }}"
 functional_groups_file_path: "{{ hostvars['localhost']['functional_groups_config_path'] }}"
 software_config_file_path: "{{ input_project_dir }}/software_config.json"
-default_json_path: "{{ input_project_dir }}/config/aarch64/rhel/10.0/default_packages.json"
 aarch64_build_image_completion_msg: |
   The playbook build_image_aarch64.yml has been completed successfully.
   To boot x86_64 and aarch64 nodes execute discovery/discovery.yml playbook.

build_image_aarch64/roles/prepare_arm_node/tasks/main.yml

@@ -167,7 +167,7 @@
 
 - name: Build full Podman image path
   ansible.builtin.set_fact:
-    pulp_aarch_image: "{{ hostvars['localhost']['oim_pxe_ip'] }}:2225/dellhpcomniaaisolution/image-build-aarch64:latest"
+    pulp_aarch_image: "{{ hostvars['localhost']['oim_pxe_ip'] }}:2225/dellhpcomniaaisolution/image-build-aarch64:1.1"
 
 - name: Pull aarch64 image using Podman
   ansible.builtin.command:

build_image_aarch64/roles/prepare_arm_node/vars/main.yml

@@ -22,7 +22,6 @@ aarch64_regctl_url: "https://github.com/regclient/regclient/releases/latest/down
 pulp_repo_file_path: "/etc/yum.repos.d/pulp.repo"
 pulp_webserver_cert_path: "/opt/omnia/pulp/settings/certs/pulp_webserver.crt"
 anchors_path: "/etc/pki/ca-trust/source/anchors/pulp_webserver.crt"
-regctl_tar_path: "omnia/offline_repo/cluster/aarch64/rhel/10.0/tarball/regctl-linux-arm64/regctl-linux-arm64.tar.gz"
 regctl_bin_path: "/usr/local/bin/regctl"
 
 # Error messages

build_image_x86_64/roles/fetch_packages/tasks/fetch_packages.yml

@@ -1,4 +1,4 @@
-# Copyright 2025 Dell Inc. or its subsidiaries. All Rights Reserved.
+# Copyright 2026 Dell Inc. or its subsidiaries. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -13,21 +13,20 @@
 #  limitations under the License.
 ---
 
-- name: Fetch x86_64 default_packages.json software packages
+- name: Fetch x86_64 default_packages.json and additional_packages.json software packages
   when: fg_x86_64
   block:
-    - name: Load default_packages.json
-      ansible.builtin.include_vars:
-        file: "{{ default_json_path }}"
-        name: default_package_json
+    - name: Collect base image RPM packages (default + additional + admin_debug)
+      base_image_package_collector:
+        default_json_path: "{{ default_json_path }}"
+        additional_json_path: "{{ additional_json_path | default('') }}"
+        admin_debug_json_path: "{{ admin_debug_json_path | default('') }}"
+        software_config_path: "{{ software_config_file_path }}"
+      register: base_image_output
 
-    - name: Extract rpm packages
+    - name: Set x86_64_base_image_packages
       ansible.builtin.set_fact:
-        x86_64_base_image_packages: >-
-          {{ default_package_json.default_packages.cluster
-            | selectattr('type', 'equalto', 'rpm')
-            | map(attribute='package')
-            | list }}
+        x86_64_base_image_packages: "{{ base_image_output.base_image_packages }}"
 
     - name: Debug package x86_64_base_image_packages
       ansible.builtin.debug:
@@ -39,6 +38,7 @@
         functional_groups_file: "{{ functional_groups_file_path }}"
         software_config_file: "{{ software_config_file_path }}"
         input_project_dir: "{{ input_project_dir }}"
+        additional_json_path: "{{ additional_json_path }}"
       register: compute_images_output
 
     - name: Save packages for x86_64 keys in compute_images_dict

build_image_x86_64/roles/fetch_packages/tasks/main.yml

@@ -1,4 +1,4 @@
-# Copyright 2025 Dell Inc. or its subsidiaries. All Rights Reserved.
+# Copyright 2026 Dell Inc. or its subsidiaries. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -34,9 +34,12 @@
     file: "{{ software_config_file_path }}"
     name: software_config
 
-- name: Set cluster_os_version as rhel_tag variable
+- name: Set cluster OS facts
   ansible.builtin.set_fact:
     rhel_tag: "{{ software_config.cluster_os_version }}"
+    default_json_path: "{{ input_project_dir }}/config/x86_64/{{ software_config.cluster_os_type }}/{{ software_config.cluster_os_version }}/default_packages.json"   # noqa: yaml[line-length]
+    additional_json_path: "{{ input_project_dir }}/config/x86_64/{{ software_config.cluster_os_type }}/{{ software_config.cluster_os_version }}/additional_packages.json"   # noqa: yaml[line-length]
+    admin_debug_json_path: "{{ input_project_dir }}/config/x86_64/{{ software_config.cluster_os_type }}/{{ software_config.cluster_os_version }}/admin_debug_packages.json"  # noqa: yaml[line-length]
 
 - name: Fetch pulp endpoint repos
   ansible.builtin.include_tasks: fetch_pulp_repos.yml

build_image_x86_64/roles/fetch_packages/vars/main.yml

@@ -1,4 +1,4 @@
-# Copyright 2025 Dell Inc. or its subsidiaries. All Rights Reserved.
+# Copyright 2026 Dell Inc. or its subsidiaries. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ local_repo_check_msg: |
 input_project_dir: "{{ hostvars['localhost']['input_project_dir'] }}"
 functional_groups_file_path: "{{ hostvars['localhost']['functional_groups_config_path'] }}"
 software_config_file_path: "{{ input_project_dir }}/software_config.json"
-default_json_path: "{{ input_project_dir }}/config/x86_64/rhel/10.0/default_packages.json"
 x86_64_build_image_completion_msg: |
   The playbook build_image_x86_64.yml has been completed successfully.
   To boot x86_64 nodes execute discovery/discovery.yml playbook.

build_image_x86_64/roles/image_creation/tasks/build_image_tag.yml

@@ -13,21 +13,16 @@
 #  limitations under the License.
 ---
 
-- name: Pull specific OpenCHAMI image by version tag
+- name: Pull image-build image
   ansible.builtin.command:
-    cmd: "podman pull {{ openchami_image_sha }}"
+    cmd: "podman pull {{ image_build_el10 }}"
   register: pull_result
+  retries: "{{ pull_image_retries }}"
+  delay: "{{ pull_image_delay }}"
+  until: pull_result.rc == 0
   changed_when: "'Image is up to date' not in pull_result.stdout"
 
 - name: Fail if image not pulled successfully
   ansible.builtin.fail:
     msg: "{{ pull_result.stdout }}"
   when: pull_result.rc != 0
-
-- name: Tagging OpenCHAMI image with stable name
-  ansible.builtin.command:
-    cmd: "{{ ochami_stable_image_tag }}"
-  args:
-    creates: "{{ ochami_stable_image_path }}"
-  register: tag_result
-  changed_when: "'Tagged' in tag_result.stdout"