Skip to content

Feature/mono pr4 build and path fixes#4795

Merged
abhishek-sa1 merged 4 commits into
dell:q3_mainfrom
abhishek-sa1:feature/mono-pr4-build-and-path-fixes
Jun 29, 2026
Merged

Feature/mono pr4 build and path fixes#4795
abhishek-sa1 merged 4 commits into
dell:q3_mainfrom
abhishek-sa1:feature/mono-pr4-build-and-path-fixes

Conversation

@abhishek-sa1

@abhishek-sa1 abhishek-sa1 commented Jun 26, 2026

Copy link
Copy Markdown
Collaborator

Summary

Migrates container build infrastructure to src/containers/ as part of mono-repo PR4, updates omnia.sh and playbook paths, replaces Dockerfile with Containerfile naming convention, and fixes .gitignore paths for build_stream.

Problem

  • Container build scripts and Dockerfiles were scattered in pre-migration locations
  • Path references in omnia.sh and other scripts used old directory structure
  • Dockerfile naming convention inconsistent with Podman/Containerfile standard
  • .gitignore had stale paths for build_stream directory

Solution

Container migration (commit 786b601):

  • Migrated all container build scripts and Containerfiles to src/containers/
  • Added container build infrastructure: build_images.sh, _common.sh, README.md
  • Added per-container build scripts for: omnia_core, omnia_auth, omnia_build_stream, ldms, kafkapump, victoriapump, telemetry_receiver, image_builder
  • Replaced Dockerfile with Containerfile naming convention (Podman standard)

Path fixes (commit 9b1a2bf):

Files Changed

  • Container build scripts migrated to src/containers/
  • omnia.sh - path updates

Testing

  • Verified container build scripts work in new location
  • Validated omnia.sh path references
  • Confirmed .gitignore patterns match actual directory structure

Backward Compatibility

  • Container build entry points remain the same (build_images.sh)
  • omnia.sh behavior unchanged (internal path updates only)
  • No breaking changes to existing functionality

- 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/
@abhishek-sa1 abhishek-sa1 marked this pull request as ready for review June 29, 2026 13:33
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
@abhishek-sa1 abhishek-sa1 merged commit e04ddc5 into dell:q3_main Jun 29, 2026
4 checks passed
abhishek-sa1 added a commit to abhishek-sa1/omnia that referenced this pull request Jun 29, 2026
* 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>
abhishek-sa1 added a commit that referenced this pull request Jul 3, 2026
…RPM documentation` (#4803)

* PR4: monorepo path fixes — omnia.sh, containers, playbook paths, .gitignore BATS helpers

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* PR4: remove legacy test_pr4_validation.sh (replaced by BATS test)

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* 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/

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* feat(PR5): separate RPM build from omnia-artifactory into src/rpm_build/

- 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>

* Feature/mono pr4 build and path fixes (#4795)

* 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>

* feat(pr5): add aarch64 image-builder support, rewrite container/RPM READMEs

- 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>

* sync: merge files staging

Signed-off-by: abhishek-sa1 <abhishek.sa3@dell.com>
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* copyright update

Signed-off-by: abhishek-sa1 <abhishek.sa3@dell.com>
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* fix: add execute permissions to shell scripts

- 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>

* fix(rpm_build): fix OVIS clone logic and add execute permissions

- 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>

* fix(rpm_build): fix recursive call and path

Signed-off-by: abhishek-sa1 <abhishek.sa3@dell.com>
Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>

* fix: resolve 4 ShellCheck errors (SC2199, SC1128)

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>

---------

Signed-off-by: Abhishek S A <abhishek.sa3@dell.com>
Signed-off-by: abhishek-sa1 <abhishek.sa3@dell.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants