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-5.9] LOG-5062: align validation with documentation #2437

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #2394

/assign jcantrill

Signed-off-by: Vitalii Parfonov <vparfono@redhat.com>
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 19, 2024

@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: LOG-5062

In response to this:

This is an automated cherry-pick of #2394

/assign jcantrill

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.

@vparfonov
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 19, 2024
@jcantrill
Copy link
Contributor

/approve

Copy link
Contributor

openshift-ci bot commented Apr 19, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill, 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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 19, 2024
Copy link
Contributor

openshift-ci bot commented Apr 19, 2024

@openshift-cherrypick-robot: 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/test-infra repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 29a591a into openshift:release-5.9 Apr 19, 2024
7 checks passed
@vparfonov
Copy link
Contributor

/cherry-pick release-5.8

@openshift-cherrypick-robot
Copy link
Author

@vparfonov: #2437 failed to apply on top of branch "release-5.8":

Applying: LOG-5062: align validation function with documentation
Using index info to reconstruct a base tree...
A	internal/controller/forwarding/forwarding_controller_test.go
M	internal/validations/clusterlogging/validate_clusterlogging_spec.go
M	internal/validations/clusterlogging/validate_clusterlogging_spec_test.go
M	internal/validations/clusterlogging/validations.go
Falling back to patching base and 3-way merge...
Auto-merging internal/validations/clusterlogging/validations.go
Auto-merging internal/validations/clusterlogging/validate_clusterlogging_spec_test.go
Auto-merging internal/validations/clusterlogging/validate_clusterlogging_spec.go
CONFLICT (content): Merge conflict in internal/validations/clusterlogging/validate_clusterlogging_spec.go
Auto-merging controllers/forwarding/forwarding_controller_test.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 LOG-5062: align validation function with documentation
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-5.8

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/test-infra 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. lgtm Indicates that a PR is ready to be merged. release/5.9
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants