Skip to content

Cherry-pick: Fix CLI version in Konflux builds#187

Merged
Joeavaikath merged 2 commits into
migtools:oadp-1.6from
Joeavaikath:cherrypick-version-fix-to-1.6
May 4, 2026
Merged

Cherry-pick: Fix CLI version in Konflux builds#187
Joeavaikath merged 2 commits into
migtools:oadp-1.6from
Joeavaikath:cherrypick-version-fix-to-1.6

Conversation

@Joeavaikath
Copy link
Copy Markdown
Contributor

Summary

Cherry-pick of #184 and #186 to oadp-1.6.

  • Renames VERSION to OADP_VERSION in Containerfile.download to avoid collision with Konflux-injected VERSION (Go toolchain version)
  • Uses ART-injected BUILD_VERSION and SOURCE_GIT_COMMIT env vars in konflux.Dockerfile for correct version info
  • Fixes oc oadp version reporting Version: 1.25 (Go version) instead of the actual OADP version

Test plan

  • Verify next Konflux build produces binary with Version: 1.6.0
  • Verify Git commit shows the correct SHA

🤖 Generated with Claude Code

openshift-merge-bot Bot and others added 2 commits May 4, 2026 15:44
Rename VERSION to OADP_VERSION in konflux.Dockerfile
…version

Use ART-injected env vars for version in Konflux builds
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 4, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 7941caef-fafd-4eb5-b391-1768d06d5a45

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

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

Copy link
Copy Markdown
Member

@kaovilai kaovilai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 4, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Joeavaikath, kaovilai, shubham-pampattiwar

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [Joeavaikath,kaovilai,shubham-pampattiwar]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@Joeavaikath Joeavaikath merged commit d208921 into migtools:oadp-1.6 May 4, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants