Skip to content

Conversation

@ecordell
Copy link
Contributor

Cherry pick of #329

@openshift-ci-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Feb 28, 2020
@openshift-ci-robot
Copy link

@ecordell: This pull request references Bugzilla bug 1804554, which is invalid:

  • expected dependent Bugzilla bug 1790785 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is POST instead

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

Details

In response to this:

Bug 1804554: bump(operator-framework/operator-registry)

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 the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Feb 28, 2020
@ecordell
Copy link
Contributor Author

/bugzilla refresh

@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. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Feb 28, 2020
@openshift-ci-robot
Copy link

@ecordell: This pull request references Bugzilla bug 1804554, which is valid. 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.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.4.0) matches configured target release for branch (4.4.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1790785 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1790785 targets the "4.5.0" release, matching the expected (4.5.0) release
  • bug has dependents
Details

In response to this:

/bugzilla refresh

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.

@ecordell ecordell changed the title Bug 1804554: bump(operator-framework/operator-registry) [release 4.4] Bug 1804554: bump(operator-framework/operator-registry) Feb 28, 2020
@Bowenislandsong
Copy link

/retest

Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 28, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

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

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Feb 28, 2020
@openshift-merge-robot openshift-merge-robot merged commit bc08a48 into openshift:release-4.4 Feb 28, 2020
@openshift-ci-robot
Copy link

@ecordell: All pull requests linked via external trackers have merged. Bugzilla bug 1804554 has been moved to the MODIFIED state.

Details

In response to this:

[release 4.4] Bug 1804554: bump(operator-framework/operator-registry)

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.

@ecordell
Copy link
Contributor Author

ecordell commented Mar 2, 2020

/cherry-pick release-4.3

@openshift-cherrypick-robot

@ecordell: #331 failed to apply on top of branch "release-4.3":

.git/rebase-apply/patch:1043: trailing whitespace.
	query := `SELECT DISTINCT bundlepath FROM operatorbundle 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/operator-framework/operator-registry/pkg/apprclient/client.go
M	vendor/github.com/operator-framework/operator-registry/pkg/appregistry/builder.go
A	vendor/github.com/operator-framework/operator-registry/pkg/containertools/command.go
A	vendor/github.com/operator-framework/operator-registry/pkg/containertools/dockerfilegenerator.go
A	vendor/github.com/operator-framework/operator-registry/pkg/containertools/imagereader.go
M	vendor/github.com/operator-framework/operator-registry/pkg/registry/interface.go
A	vendor/github.com/operator-framework/operator-registry/pkg/sqlite/image.go
M	vendor/github.com/operator-framework/operator-registry/pkg/sqlite/load.go
M	vendor/github.com/operator-framework/operator-registry/pkg/sqlite/query.go
M	vendor/google.golang.org/grpc/internal/transport/http2_server.go
M	vendor/google.golang.org/grpc/version.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/google.golang.org/grpc/version.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/version.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/http2_server.go
Auto-merging vendor/github.com/operator-framework/operator-registry/pkg/sqlite/query.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-registry/pkg/sqlite/query.go
Auto-merging vendor/github.com/operator-framework/operator-registry/pkg/sqlite/load.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-registry/pkg/sqlite/load.go
CONFLICT (modify/delete): vendor/github.com/operator-framework/operator-registry/pkg/sqlite/image.go deleted in HEAD and modified in bump(operator-framework/operator-registry). Version bump(operator-framework/operator-registry) of vendor/github.com/operator-framework/operator-registry/pkg/sqlite/image.go left in tree.
Auto-merging vendor/github.com/operator-framework/operator-registry/pkg/registry/interface.go
CONFLICT (modify/delete): vendor/github.com/operator-framework/operator-registry/pkg/containertools/imagereader.go deleted in HEAD and modified in bump(operator-framework/operator-registry). Version bump(operator-framework/operator-registry) of vendor/github.com/operator-framework/operator-registry/pkg/containertools/imagereader.go left in tree.
CONFLICT (modify/delete): vendor/github.com/operator-framework/operator-registry/pkg/containertools/dockerfilegenerator.go deleted in HEAD and modified in bump(operator-framework/operator-registry). Version bump(operator-framework/operator-registry) of vendor/github.com/operator-framework/operator-registry/pkg/containertools/dockerfilegenerator.go left in tree.
CONFLICT (modify/delete): vendor/github.com/operator-framework/operator-registry/pkg/containertools/command.go deleted in HEAD and modified in bump(operator-framework/operator-registry). Version bump(operator-framework/operator-registry) of vendor/github.com/operator-framework/operator-registry/pkg/containertools/command.go left in tree.
Auto-merging vendor/github.com/operator-framework/operator-registry/pkg/appregistry/builder.go
Auto-merging vendor/github.com/operator-framework/operator-registry/pkg/apprclient/client.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
Patch failed at 0001 bump(operator-framework/operator-registry)

Details

In response to this:

/cherry-pick release-4.3

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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants