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 1717640: include cluster-storage-operator when testing status.relatedObjects #23228

Merged

Conversation

bertinatto
Copy link
Member

@openshift-ci-robot
Copy link

@bertinatto: This pull request references a valid Bugzilla bug.

In response to this:

Bug 1717640: include cluster-storage-operator when testing status.relatedObjects

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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 20, 2019
@bertinatto bertinatto changed the title Bug 1717640: include cluster-storage-operator when testing status.relatedObjects [WIP] Bug 1717640: include cluster-storage-operator when testing status.relatedObjects Jun 20, 2019
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 20, 2019
@bertinatto bertinatto changed the title [WIP] Bug 1717640: include cluster-storage-operator when testing status.relatedObjects Bug 1717640: include cluster-storage-operator when testing status.relatedObjects Jun 21, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 21, 2019
@bertinatto
Copy link
Member Author

CC @openshift/storage

@bertinatto
Copy link
Member Author

/assign @mfojtik @bparees

@bparees
Copy link
Contributor

bparees commented Jun 21, 2019

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bertinatto, bparees

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 21, 2019
@openshift-merge-robot openshift-merge-robot merged commit 2485e82 into openshift:master Jun 21, 2019
@bertinatto
Copy link
Member Author

/cherry-pick release-4.1

@openshift-cherrypick-robot

@bertinatto: #23228 failed to apply on top of branch "release-4.1":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	test/extended/operators/clusteroperators.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/extended/operators/clusteroperators.go deleted in HEAD and modified in Bug 1717640: include cluster-storage-operator when testing status.relatedObjects. Version Bug 1717640: include cluster-storage-operator when testing status.relatedObjects of test/extended/operators/clusteroperators.go left in tree.
Patch failed at 0001 Bug 1717640: include cluster-storage-operator when testing status.relatedObjects

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.

@openshift-cherrypick-robot

@bertinatto: #23228 failed to apply on top of branch "release-4.1":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	test/extended/operators/clusteroperators.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/extended/operators/clusteroperators.go deleted in HEAD and modified in Bug 1717640: include cluster-storage-operator when testing status.relatedObjects. Version Bug 1717640: include cluster-storage-operator when testing status.relatedObjects of test/extended/operators/clusteroperators.go left in tree.
Patch failed at 0001 Bug 1717640: include cluster-storage-operator when testing status.relatedObjects

In response to this:

/cherrypick 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants