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

Bug 1727042: feat(operatorstatus): report packageserver as upgradeable #989

Conversation

ecordell
Copy link
Member

The PR that added Upgradeable for olm and catalog missed packageserver.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 16, 2019
@openshift-ci-robot
Copy link
Collaborator

@ecordell: This pull request references a valid Bugzilla bug. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Bug 1727042: feat(operatorstatus): report packageserver as upgradeable

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.

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 16, 2019
@ecordell ecordell force-pushed the packageserver-upgradeable branch from 652070d to 6346758 Compare August 16, 2019 20:10
@ecordell
Copy link
Member Author

/retest

@kevinrizza
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 23, 2019
@kevinrizza
Copy link
Member

/lgtm cancel

Didn't know that would actually add the label :)

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Aug 23, 2019
@ecordell
Copy link
Member Author

/retest

@jpeeler
Copy link

jpeeler commented Aug 26, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 26, 2019
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ecordell, jpeeler

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

@ecordell
Copy link
Member Author

/retest

@openshift-merge-robot openshift-merge-robot merged commit 21160c2 into operator-framework:master Aug 27, 2019
@ecordell
Copy link
Member Author

/cherry-pick release-4.1

@openshift-cherrypick-robot

@ecordell: #989 failed to apply on top of branch "release-4.1":

Using index info to reconstruct a base tree...
A	pkg/lib/operatorstatus/builder.go
A	pkg/lib/operatorstatus/builder_test.go
A	pkg/lib/operatorstatus/csv_reporter.go
A	pkg/lib/operatorstatus/csv_reporter_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/lib/operatorstatus/csv_reporter_test.go deleted in HEAD and modified in feat(operatorstatus): report packageserver as upgradeable. Version feat(operatorstatus): report packageserver as upgradeable of pkg/lib/operatorstatus/csv_reporter_test.go left in tree.
CONFLICT (modify/delete): pkg/lib/operatorstatus/csv_reporter.go deleted in HEAD and modified in feat(operatorstatus): report packageserver as upgradeable. Version feat(operatorstatus): report packageserver as upgradeable of pkg/lib/operatorstatus/csv_reporter.go left in tree.
CONFLICT (modify/delete): pkg/lib/operatorstatus/builder_test.go deleted in HEAD and modified in feat(operatorstatus): report packageserver as upgradeable. Version feat(operatorstatus): report packageserver as upgradeable of pkg/lib/operatorstatus/builder_test.go left in tree.
CONFLICT (modify/delete): pkg/lib/operatorstatus/builder.go deleted in HEAD and modified in feat(operatorstatus): report packageserver as upgradeable. Version feat(operatorstatus): report packageserver as upgradeable of pkg/lib/operatorstatus/builder.go left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 feat(operatorstatus): report packageserver as upgradeable

In response to this:

/cherry-pick release-4.1

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. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants