Bug 1983673: Check for pruned bundles on add in replaces mode

[ankitathomas]

• check for pruned bundles in replaces-mode add

Signed-off-by: Ankita Thomas ankithom@redhat.com

• improve readability, generate testdata

Signed-off-by: Ankita Thomas ankithom@redhat.com

Upstream-repository: operator-registry
Upstream-commit: d446d3cf05b2aafccdee8d8b9ea09bbbf4279e28

[openshift-ci]

@ankitathomas: An error was encountered searching for bug 1983673 on the Bugzilla server at https://bugzilla.redhat.com. No known errors were detected, please see the full error message for details.

Full error message.

could not unmarshal response body: invalid character '<' looking for beginning of value

Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

Bug 1983673: Check for pruned bundles on add in replaces mode

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.

[ankitathomas]

/bugzilla refresh

[ankitathomas]

/retest

[joelanford]

/bugzilla refresh

[dinhxuanvu]

/lgtm

[openshift-ci]

@joelanford: An error was encountered querying GitHub for users with public email (jiazha@redhat.com) for bug 1983673 on the Bugzilla server at https://bugzilla.redhat.com. No known errors were detected, please see the full error message for details.

Full error message.

Post "http://ghproxy/graphql": dial tcp 172.30.229.2:80: i/o timeout

Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

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.

[dinhxuanvu]

/bugzilla refresh

[openshift-ci]

@dinhxuanvu: An error was encountered querying GitHub for users with public email (jiazha@redhat.com) for bug 1983673 on the Bugzilla server at https://bugzilla.redhat.com. No known errors were detected, please see the full error message for details.

Full error message.

Post "http://ghproxy/graphql": dial tcp 172.30.229.2:80: i/o timeout

Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

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.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ankitathomas, dinhxuanvu

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:

• OWNERS [ankitathomas,dinhxuanvu]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-ci]

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

• openshift/operator-framework-olm#160

Bugzilla bug 1983673 has been moved to the MODIFIED state.

In response to this:

Bug 1983673: Check for pruned bundles on add in replaces mode

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.

[ankitathomas]

/cherry-pick release-4.8

[openshift-cherrypick-robot]

@ankitathomas: #160 failed to apply on top of branch "release-4.8":

Applying: check for pruned bundles on add in replaces mode (#732)
.git/rebase-apply/patch:18: trailing whitespace.
		If multiple bundles are given with '--mode=replaces' (the default), bundles are added to the index by order of ascending (semver) version unless the update graph specified by replaces requires a different input order; e.g. 1.0.0 replaces 1.0.1 would result in [1.0.1, 1.0.0] instead of the [1.0.0, 1.0.1] normally expected of semver. However, for most cases (e.g. 1.0.1 replaces 1.0.0) the bundle with the highest version is used to set the default channel of the related package.  
.git/rebase-apply/patch:20: trailing whitespace.
		Caveat: in replaces mode, the head of a channel is always the bundle with the highest semver. Any bundles upgrading from this channel-head will be pruned.  
.git/rebase-apply/patch:21: trailing whitespace.
		An upgrade graph that looks like:  
.git/rebase-apply/patch:22: trailing whitespace.
		0.1.1 -> 0.1.2 -> 0.1.2-1  
.git/rebase-apply/patch:23: trailing whitespace.
		will be pruned on add to:  
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	staging/operator-registry/cmd/opm/index/add.go
M	staging/operator-registry/pkg/lib/registry/registry.go
A	staging/operator-registry/pkg/lib/registry/registry_test.go
M	vendor/github.com/operator-framework/operator-registry/cmd/opm/index/add.go
M	vendor/github.com/operator-framework/operator-registry/pkg/lib/registry/registry.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-registry/pkg/lib/registry/registry.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-registry/pkg/lib/registry/registry.go
Auto-merging vendor/github.com/operator-framework/operator-registry/cmd/opm/index/add.go
CONFLICT (modify/delete): staging/operator-registry/pkg/lib/registry/registry_test.go deleted in HEAD and modified in check for pruned bundles on add in replaces mode (#732). Version check for pruned bundles on add in replaces mode (#732) of staging/operator-registry/pkg/lib/registry/registry_test.go left in tree.
Auto-merging staging/operator-registry/pkg/lib/registry/registry.go
CONFLICT (content): Merge conflict in staging/operator-registry/pkg/lib/registry/registry.go
Auto-merging staging/operator-registry/cmd/opm/index/add.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 check for pruned bundles on add in replaces mode (#732)
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.8

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.