feat: PR5 — RPM build separation, aarch64 image-builder, container & RPM documentation`#4803
Merged
abhishek-sa1 merged 13 commits intoJul 3, 2026
Merged
Conversation
…ignore BATS helpers Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
- Migrate container build scripts and Containerfiles to src/containers/ - Add build_images.sh, _common.sh, README.md for container build infra - Add per-container build.sh for: omnia_core, omnia_auth, omnia_build_stream, ldms, kafkapump, victoriapump, telemetry_receiver, image_builder - Replace Dockerfile with Containerfile naming convention - Fix .gitignore: stale build_stream/ paths updated to src/build_stream/ Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
- Import LDMS RPM build scripts from omnia-artifactory RpmFile/ldms/build/ - Add src/rpm_build/build_rpm.sh (entry point, updated paths for monorepo) - Add src/rpm_build/ldms/build_ldms.rockylinux10.bash (Rocky 10 build) - Add src/rpm_build/ldms/start_build_container.rockylinux10.bash (container launcher) - Add src/rpm_build/ldms/configure.sh (LDMS configure flags) - Add src/rpm_build/ldms/rpm_postuninstall.txt (RPM post-uninstall hook) - Source: omnia-artifactory (omnia-container branch) RpmFile/ Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
* PR4: monorepo path fixes — omnia.sh, containers, playbook paths, .gitignore BATS helpers * PR4: remove legacy test_pr4_validation.sh (replaced by BATS test) * feat(PR4): migrate containers to src/containers/ + fix .gitignore paths - Migrate container build scripts and Containerfiles to src/containers/ - Add build_images.sh, _common.sh, README.md for container build infra - Add per-container build.sh for: omnia_core, omnia_auth, omnia_build_stream, ldms, kafkapump, victoriapump, telemetry_receiver, image_builder - Replace Dockerfile with Containerfile naming convention - Fix .gitignore: stale build_stream/ paths updated to src/build_stream/ * Update omnia.sh Signed-off-by: Abhishek S A <abhishek.sa3@dell.com> --------- Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
…EADMEs - image_builder/build.sh: auto-detect host arch (uname -m) to produce image-build-el10 (x86_64) or image-build-aarch64 (aarch64); same Containerfile.el10 handles both via multi-arch Go download - Docker mode maps platform from docker info to correct image name - containers/README.md: complete rewrite with directory layout, dual-arch docs, build groups, parameters table, Docker vs Podman comparison, troubleshooting; removed stale omnia_branch parameter (not implemented) - rpm_build/README.md: new file documenting build_rpm.sh workflow, arch support (x86_64 + aarch64 auto-detected), parameters, prerequisites, relationship between container images and RPM packages Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
cc5120a to
e398380
Compare
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: abhishek-sa1 <abhishek.sa3@dell.com> Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: abhishek-sa1 <abhishek.sa3@dell.com> Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
- src/main/omnia.sh (chmod +x) - src/containers/build_images.sh (chmod +x) - src/rpm_build/build_rpm.sh (chmod +x) - Update copyright year to 2026 in omnia.sh These scripts need execute permissions to run properly on Linux systems. Signed-off-by: abhishek-sa1 <abhishek.sa3@dell.com> Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
- Remove git pull from main branch (causes rebase conflicts) - Skip update if OVIS repo already exists (use cloned version tag) - Add execute permissions to all shell scripts in: - src/rpm_build/ (4 scripts) - src/containers/ (14 scripts) Fixes: - OVIS v4.5.2 tag clone conflicts with main branch pull - Permission denied errors on build scripts - Incorrect relative path in container Signed-off-by: abhishek-sa1 <abhishek.sa3@dell.com> Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: abhishek-sa1 <abhishek.sa3@dell.com> Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Changes: - Fix array expansion in [[ ]] - use \ instead of \ * build_images.sh line 94: VALID_PARAMS check * build_images.sh line 152: COMMON_PARAMS check * build_images.sh line 155: allowed_params check - Move shebang to first line in migrate_strimzi_crds.sh - Revert LDMS version to 4.5.1 (user preference) - Remove v4.5.2 autoconf patch (not needed for 4.5.1) The [*] expansion concatenates array elements with spaces, which is exactly what the regex pattern matching needs. The surrounding spaces in the pattern ensure exact parameter name matching. ShellCheck: 0 errors, 38 warnings (warnings not fixed per user request) Signed-off-by: abhishek-sa1 <abhishek.sa3@dell.com> Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
c20f1fe to
1916239
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Separates RPM build infrastructure into
src/rpm_build/, adds dual-architecture (x86_64 / aarch64) support to the image-builder container, and rewrites container and RPM documentation. Built on top of PR4 (merged as #4795).Changes
1. RPM Build Separation (
src/rpm_build/)x86_64/aarch64) and passes--archto Podman2. aarch64 Image Builder Support
x86_64→ producesimage-build-el10withlinux/amd64platformaarch64→ producesimage-build-aarch64withlinux/arm64platformdocker infofor platform detection and maps to correct image nameuname -m); no Containerfile changes needed3. Container README Rewrite (src/containers/README.md)
omnia_branchparameter (not wired up in new build system — core usesCOPYfrom local repo)4. RPM Build README (new: src/rpm_build/README.md)
-v,-u,-n), prerequisitessrc/rpm_build/) — different deployment modelsFiles Changed
src/rpm_build/ldms/*Architecture Matrix
image-build-el10image-build-aarch64Testing
image-build-aarch64:1.2)Backward Compatibility
image-build-el10image nameimage-build-aarch64instead of incorrectly usingimage-build-el10Additional changes