Skip to content

Conversation

@alanconway
Copy link
Contributor

Description

Fixed 2 issues, due to files not copied to image build:

  • added '2> /dev/null' to silence git command used to get current branch.build.
  • make targets using olm_deploy/ conditional on existence of directory.

/cc @xperimental
/assign @jcantrill

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 15, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alanconway

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 15, 2025
@jcantrill
Copy link
Contributor

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 19, 2025
@alanconway
Copy link
Contributor Author

Simplified and minimized the change - restored meaning of CURRENT_BRANCH. @xperimental @vparfonov I think this resolves your issues. @xperimental I left the .target stuff alone since it's not necessary to change it for this fix, but your comment is not wrong.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 5, 2026

@alanconway: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@jcantrill
Copy link
Contributor

/hold cancel

@jcantrill
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jan 6, 2026
@openshift-merge-bot openshift-merge-bot bot merged commit 3d6d5c9 into openshift:master Jan 6, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants