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

Remove suggestions if status is not present in CR #4093

Conversation

varshaprasad96
Copy link
Member

Description of the change:
Remove suggestions if status is not present in CR

Follow up: #4009

Motivation for the change:

Checklist

If the pull request includes user-facing changes, extra documentation is required:

Copy link
Contributor

@camilamacedo86 camilamacedo86 left a comment

Choose a reason for hiding this comment

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

/lgtm
I understand that it is the suggestion made by @estroz.
Comment : #4009 (comment)

Also, it needs to cherry-pick as well.

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 22, 2020
@varshaprasad96
Copy link
Member Author

Merging this. Will cherrypick this. #4088 also needs to be cherry picked.

@varshaprasad96 varshaprasad96 merged commit 0ccdc4e into operator-framework:master Oct 26, 2020
@varshaprasad96 varshaprasad96 deleted the scorecard/fix-suggestions branch October 26, 2020 19:07
@varshaprasad96
Copy link
Member Author

/cherry-pick v1.0.x

@openshift-cherrypick-robot

@varshaprasad96: #4093 failed to apply on top of branch "v1.0.x":

Applying: Remove suggestions if status is not present in CR
Using index info to reconstruct a base tree...
M	internal/scorecard/tests/olm.go
Falling back to patching base and 3-way merge...
Auto-merging internal/scorecard/tests/olm.go
CONFLICT (content): Merge conflict in internal/scorecard/tests/olm.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 Remove suggestions if status is not present in CR
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 v1.0.x

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

Successfully merging this pull request may close these issues.

None yet

5 participants