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 1895367: Include the bundle image itself as a related image. #527

Conversation

benluddy
Copy link
Contributor

@benluddy benluddy commented Dec 1, 2020

No description provided.

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Dec 1, 2020
@openshift-ci-robot
Copy link

@benluddy: This pull request references Bugzilla bug 1895367, 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.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1895367: Include the bundle image itself as a related image.

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 1, 2020
@codecov
Copy link

codecov bot commented Dec 1, 2020

Codecov Report

Merging #527 (d6abd77) into master (beace54) will increase coverage by 0.06%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #527      +/-   ##
==========================================
+ Coverage   49.31%   49.38%   +0.06%     
==========================================
  Files          90       90              
  Lines        6302     6308       +6     
==========================================
+ Hits         3108     3115       +7     
+ Misses       2498     2497       -1     
  Partials      696      696              
Impacted Files Coverage Δ
pkg/registry/bundle.go 60.58% <100.00%> (+2.05%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update beace54...d6abd77. Read the comment docs.

@benluddy
Copy link
Contributor Author

benluddy commented Dec 1, 2020

/cherry-pick release-4.6

@openshift-cherrypick-robot

@benluddy: once the present PR merges, I will cherry-pick it on top of release-4.6 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.6

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.

@benluddy benluddy force-pushed the bundle-image-in-related-images branch from fc285cc to d6abd77 Compare December 1, 2020 22:04
Copy link
Member

@ecordell ecordell left a comment

Choose a reason for hiding this comment

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

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@benluddy
Copy link
Contributor Author

benluddy commented Dec 2, 2020

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 2e165d3 into operator-framework:master Dec 3, 2020
@openshift-ci-robot
Copy link

@benluddy: All pull requests linked via external trackers have merged:

Bugzilla bug 1895367 has been moved to the MODIFIED state.

In response to this:

Bug 1895367: Include the bundle image itself as a related image.

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

@benluddy: #527 failed to apply on top of branch "release-4.6":

Applying: Include the bundle image itself as a related image.
Using index info to reconstruct a base tree...
M	pkg/registry/bundle.go
M	pkg/registry/bundle_test.go
M	pkg/registry/populator_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/registry/populator_test.go
Auto-merging pkg/registry/bundle_test.go
CONFLICT (content): Merge conflict in pkg/registry/bundle_test.go
Auto-merging pkg/registry/bundle.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 Include the bundle image itself as a related image.
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-4.6

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/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants