Fix MicroShift build problems caused by OKD version disperancy and downstream changes

[ggiguash]

Resolves #216

See #218 for a follow-up on cleaning up the TODO item introducted in this PR.

Summary by CodeRabbit

• Chores
  • Updated build system with improved help documentation and target organization.
  • Enhanced cross-platform build support with per-architecture version detection for amd64 and arm64 systems.

[coderabbitai]

📝 Walkthrough

Walkthrough

The PR extends the Makefile's help text with additional sub-target descriptions and reorders the copr.mk include. It also adds skopeo to the SRPM container, introduces per-architecture OKD version detection via get_version.sh, and updates prebuild scripts to use architecture-specific version tags instead of a shared global tag.

Changes

Makefile Help & Include Ordering

Layer / File(s)	Summary
Help Text Extension Makefile	all target help output extended with COPR-related and run/cleanup sub-target descriptions.
Include Reordering Makefile	src/copr/copr.mk include moved after the all target definition to ensure help output generates correctly.

Multi-Architecture OKD Version Detection

Layer / File(s)	Summary
Dependencies packaging/srpm.Containerfile	skopeo added to dnf install list alongside existing build dependencies.
Version Script Setup packaging/srpm.Containerfile	OKD_GET_VERSION_SCRIPT build arg and ./src/okd/get_version.sh copied into container image.
Per-Architecture Version Detection packaging/srpm.Containerfile	New RUN block auto-detects OKD version tags for x86_64 and aarch64 architectures, writes them to /tmp/okd_version_x86_64 and /tmp/okd_version_aarch64.
Prebuild Script Updates packaging/srpm.Containerfile	USHIFT_PREBUILD_SCRIPT calls updated to use per-architecture version files instead of shared OKD_VERSION_TAG for OKD release, kindnet, and multus image replacements.

Sequence Diagram

sequenceDiagram
    participant Build as Container Build
    participant Script as get_version.sh
    participant Files as Version Files
    participant Prebuild as prebuild.sh

    Build->>Script: Execute to detect OKD versions
    Script->>Script: Detect arch-specific versions
    Script->>Files: Write x86_64 version to /tmp/okd_version_x86_64
    Script->>Files: Write aarch64 version to /tmp/okd_version_aarch64
    Files-->>Prebuild: Read per-arch versions
    Prebuild->>Prebuild: Replace OKD/kindnet/multus refs with correct arch-specific tags

Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly related PRs

• Fix OKD version detection in make rpm #160: Implements per-architecture OKD_VERSION_TAG logic in Makefile that parallels this PR's multi-arch version detection in the container build.
• Fix OKD version detection to be 'ec' and 'rc' release aware #152: Both PRs modify OKD version detection mechanism by integrating src/okd/get_version.sh into build flows.
• Multi-arch SRPM builder #159: Related SRPM build flow improvements for multi-arch OKD handling in packaging and Makefile.

Suggested reviewers

• pmtk
• agullon

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title accurately reflects the main changes: fixing MicroShift build problems by addressing OKD version disparity across platforms, which is directly related to the PR's code modifications.
Linked Issues check	✅ Passed	The PR addresses issue #216 by fixing OKD version handling in the build system: Makefile help output correction and per-architecture OKD version management in srpm.Containerfile to resolve versioning mismatches.
Out of Scope Changes check	✅ Passed	All changes are directly scoped to resolving #216: Makefile help text adjustment and per-architecture OKD version management in the container build. No extraneous modifications detected.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

Tip

💬 Introducing Slack Agent: The best way for teams to turn conversations into code.

Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.

• Generate code and open pull requests
• Plan features and break down work
• Investigate incidents and troubleshoot customer tickets together
• Automate recurring tasks and respond to alerts with triggers
• Summarize progress and report instantly

Built for teams:

• Shared memory across your entire org—no repeating context
• Per-thread sandboxes to safely plan and execute work
• Governance built-in—scoped access, auditability, and budget controls

One agent for your entire SDLC. Right inside Slack.

👉 Get started

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[coderabbitai]

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@packaging/srpm.Containerfile`:
- Around line 32-43: The RUN step calls the OKD_GET_VERSION_SCRIPT (which uses
skopeo list-tags) without retries and can fail transiently; add a shell retry
helper function (e.g., retry()) defined once before the conditional in the same
Dockerfile/RUN context and wrap both invocations of "${OKD_GET_VERSION_SCRIPT}"
(the two uses that produce /tmp/okd_version_x86_64 and /tmp/okd_version_aarch64)
with that retry helper so each cross-arch lookup is retried (matching the
existing curl --retry pattern) before writing the tmp files and continuing the
echo logging.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 0af485a5-2a5d-4be0-a1a7-ccf972c64278

📥 Commits

Reviewing files that changed from the base of the PR and between f915e4c and 5ff5c8b.

📒 Files selected for processing (2)

• Makefile
• packaging/srpm.Containerfile