Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-4.17] OCPBUGS-41933: fix double / in ResourceAddress #355

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #353

/assign jzding

Copy link
Contributor

openshift-ci bot commented Sep 13, 2024

Hi @openshift-cherrypick-robot. Thanks for your PR.

I'm waiting for a redhat-cne member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-39218 has been cloned as Jira Issue OCPBUGS-41933. Will retitle bug to link to clone.
/retitle [release-4.17] OCPBUGS-41933: fix double / in ResourceAddress

In response to this:

This is an automated cherry-pick of #353

/assign jzding

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 openshift-ci bot changed the title [release-4.17] OCPBUGS-39218: fix double / in ResourceAddress [release-4.17] OCPBUGS-41933: fix double / in ResourceAddress Sep 13, 2024
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-41933, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is an automated cherry-pick of #353

/assign jzding

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.

Copy link
Member

@jzding jzding 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 openshift-ci bot added the lgtm label Sep 13, 2024
Copy link
Contributor

openshift-ci bot commented Sep 13, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jzding, openshift-cherrypick-robot

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:

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

@jzding jzding merged commit a26c7d7 into redhat-cne:release-4.17 Sep 13, 2024
2 of 3 checks passed
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-41933: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-41933 has been moved to the MODIFIED state.

In response to this:

This is an automated cherry-pick of #353

/assign jzding

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.

@jzding
Copy link
Member

jzding commented Sep 13, 2024

/cherry-pick release-4.16

@openshift-cherrypick-robot
Copy link
Author

@jzding: #355 failed to apply on top of branch "release-4.16":

Applying: fix double / in ResourceAddress
Using index info to reconstruct a base tree...
M	plugins/ptp_operator/metrics/manager.go
M	plugins/ptp_operator/ptp_operator_plugin.go
M	plugins/ptp_operator/ptp_operator_plugin_test.go
Falling back to patching base and 3-way merge...
Auto-merging plugins/ptp_operator/ptp_operator_plugin_test.go
CONFLICT (content): Merge conflict in plugins/ptp_operator/ptp_operator_plugin_test.go
Auto-merging plugins/ptp_operator/ptp_operator_plugin.go
Auto-merging plugins/ptp_operator/metrics/manager.go
CONFLICT (content): Merge conflict in plugins/ptp_operator/metrics/manager.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix double / in ResourceAddress
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.16

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 13, 2024

@openshift-cherrypick-robot: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/security 000b693 link false /test security

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: cloud-event-proxy
This PR has been included in build cloud-event-proxy-container-v4.17.0-202409131535.p0.ga26c7d7.assembly.stream.el9.
All builds following this will include this PR.

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.

4 participants