Skip to content

Conversation

jgbernalp
Copy link
Contributor

Manual cherry pick of #540

Signed-off-by: Gabriel Bernal <gbernal@redhat.com>
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 24, 2025

@jgbernalp: This pull request references OU-1005 which is a valid jira issue.

In response to this:

Manual cherry pick of #540

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 24, 2025
@openshift-ci openshift-ci bot requested a review from kyoto September 24, 2025 06:28
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 24, 2025
@jgbernalp
Copy link
Contributor Author

/cherry-pick release-coo-0.4

@openshift-cherrypick-robot

@jgbernalp: once the present PR merges, I will cherry-pick it on top of release-coo-0.4 in a new PR and assign it to you.

In response to this:

/cherry-pick release-coo-0.4

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.

Copy link
Contributor

openshift-ci bot commented Sep 24, 2025

@jgbernalp: all tests passed!

Full PR test history. Your PR dashboard.

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.

@jgbernalp
Copy link
Contributor Author

/label ux-approved
no ux changes
/label qe-approved
qe can be done post merge

@openshift-ci openshift-ci bot added ux-approved Signifies that UX has signed off on this PR qe-approved Signifies that QE has signed off on this PR labels Sep 24, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 24, 2025

@jgbernalp: This pull request references OU-1005 which is a valid jira issue.

In response to this:

Manual cherry pick of #540

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 openshift-eng/jira-lifecycle-plugin repository.

@PeterYurkovich
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 24, 2025
Copy link
Contributor

openshift-ci bot commented Sep 24, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jgbernalp, PeterYurkovich

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

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [PeterYurkovich,jgbernalp]

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

@openshift-merge-bot openshift-merge-bot bot merged commit 7cc87a4 into openshift:release-coo-0.5 Sep 24, 2025
5 checks passed
@openshift-cherrypick-robot

@jgbernalp: #552 failed to apply on top of branch "release-coo-0.4":

Applying: chore: upgrade perses dependencies, fix import warnings
Using index info to reconstruct a base tree...
M	web/package-lock.json
M	web/package.json
M	web/src/components/console/utils/single-typeahead-dropdown.tsx
M	web/src/components/dashboards/perses/PersesWrapper.tsx
M	web/src/components/kebab-dropdown.tsx
Falling back to patching base and 3-way merge...
Auto-merging web/src/components/kebab-dropdown.tsx
Auto-merging web/src/components/dashboards/perses/PersesWrapper.tsx
CONFLICT (content): Merge conflict in web/src/components/dashboards/perses/PersesWrapper.tsx
Auto-merging web/src/components/console/utils/single-typeahead-dropdown.tsx
CONFLICT (content): Merge conflict in web/src/components/console/utils/single-typeahead-dropdown.tsx
Auto-merging web/package.json
CONFLICT (content): Merge conflict in web/package.json
Auto-merging web/package-lock.json
CONFLICT (content): Merge conflict in web/package-lock.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 chore: upgrade perses dependencies, fix import warnings

In response to this:

/cherry-pick release-coo-0.4

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.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR ux-approved Signifies that UX has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants