[release-4.5] Bug 1864121: fix(install): account for installplans when calculating generation #1686

openshift-cherrypick-robot · 2020-07-29T07:14:18Z

This is an automated cherry-pick of #1684

/assign ecordell

Account for existing InstallPlans while calculating the maximum generation. This ensures new Subscriptions get a new generation and are never associated with an existing InstallPlan in cases where previous Subscriptions were deleted.

openshift-ci-robot · 2020-07-29T07:14:20Z

@openshift-cherrypick-robot: An error was encountered searching for bug 0 on the Bugzilla server at https://bugzilla.redhat.com:

code 101: Bug #0 does not exist.
Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

[release-4.5] Bug 1860185: fix(install): account for installplans when calculating generation

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.

njhale · 2020-08-03T18:07:54Z

/bugzilla refresh

openshift-ci-robot · 2020-08-03T18:07:58Z

@njhale: This pull request references Bugzilla bug 1860185, which is invalid:

expected the bug to target the "4.5.z" release, but it targets "4.6.0" instead
expected the bug to be in one of the following states: NEW, ASSIGNED, ON_DEV, POST, POST, but it is VERIFIED instead
expected Bugzilla bug 1860185 to depend on a bug targeting a release in 4.6.0, 4.6.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but no dependents were found

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.

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-robot · 2020-08-03T18:16:03Z

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1864121, 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.5.z) matches configured target release for branch (4.5.z)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1860185 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
dependent Bugzilla bug 1860185 targets the "4.6.0" release, which is one of the valid target releases: 4.6.0, 4.6.z
bug has dependents

In response to this:

[release-4.5] Bug 1864121: fix(install): account for installplans when calculating generation

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 · 2020-08-13T17:02:26Z

/bugzilla refresh

openshift-ci-robot · 2020-08-13T17:02:31Z

@ecordell: This pull request references Bugzilla bug 1864121, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.5.z) matches configured target release for branch (4.5.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1860185 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
dependent Bugzilla bug 1860185 targets the "4.6.0" release, which is one of the valid target releases: 4.6.0, 4.6.z
bug has dependents

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 · 2020-08-17T16:53:52Z

/lgtm
/cherry-pick release-4.4

openshift-cherrypick-robot · 2020-08-17T16:53:53Z

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

In response to this:

/lgtm
/cherry-pick release-4.4

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 · 2020-08-17T16:54:07Z

/approve

openshift-ci-robot · 2020-08-17T16:54:12Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ecordell, openshift-cherrypick-robot

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~~ [ecordell]

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

njhale · 2020-08-18T15:12:40Z

/cherry-pick release-4.4

openshift-cherrypick-robot · 2020-08-18T15:12:41Z

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

In response to this:

/cherry-pick release-4.4

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 · 2020-08-18T17:25:20Z

@operator-framework/patch-managers PTAL.

openshift-bot · 2020-08-19T19:44:44Z

/retest

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

openshift-bot · 2020-08-19T22:46:38Z

/retest

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

openshift-bot · 2020-08-19T22:59:46Z

/retest

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

openshift-bot · 2020-08-20T01:48:39Z

/retest

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

openshift-bot · 2020-08-20T02:14:39Z

/retest

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

openshift-ci-robot · 2020-08-20T05:25:21Z

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged: operator-framework/operator-lifecycle-manager#1686. Bugzilla bug 1864121 has been moved to the MODIFIED state.

In response to this:

[release-4.5] Bug 1864121: fix(install): account for installplans when calculating generation

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 · 2020-08-20T05:25:25Z

@ecordell: #1686 failed to apply on top of branch "release-4.4":

Applying: fix(install): account for installplans when calculating generation
Using index info to reconstruct a base tree...
M	pkg/controller/operators/catalog/operator.go
M	pkg/controller/operators/catalog/subscriptions_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/operators/catalog/subscriptions_test.go
CONFLICT (content): Merge conflict in pkg/controller/operators/catalog/subscriptions_test.go
Auto-merging pkg/controller/operators/catalog/operator.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 fix(install): account for installplans when calculating generation
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:

/lgtm
/cherry-pick release-4.4

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 assigned ecordell Jul 29, 2020

openshift-cherrypick-robot mentioned this pull request Jul 29, 2020

Bug 1860185: fix(install): account for installplans when calculating generation #1684

Merged

openshift-ci-robot requested review from anik120 and ecordell July 29, 2020 07:14

openshift-ci-robot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Aug 3, 2020

njhale changed the title ~~[release-4.5] Bug 1860185: fix(install): account for installplans when calculating generation~~ [release-4.5] Bug 1864121: fix(install): account for installplans when calculating generation Aug 3, 2020

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 Aug 3, 2020

openshift-ci-robot added bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. and removed bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. labels Aug 13, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 17, 2020

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 17, 2020

jwforres added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Aug 19, 2020

openshift-merge-robot merged commit 63b96f4 into operator-framework:release-4.5 Aug 20, 2020

[release-4.5] Bug 1864121: fix(install): account for installplans when calculating generation #1686

[release-4.5] Bug 1864121: fix(install): account for installplans when calculating generation #1686

Uh oh!

Conversation

openshift-cherrypick-robot commented Jul 29, 2020

Uh oh!

openshift-ci-robot commented Jul 29, 2020

Uh oh!

njhale commented Aug 3, 2020

Uh oh!

openshift-ci-robot commented Aug 3, 2020

Uh oh!

openshift-ci-robot commented Aug 3, 2020

Uh oh!

ecordell commented Aug 13, 2020

Uh oh!

openshift-ci-robot commented Aug 13, 2020

Uh oh!

ecordell commented Aug 17, 2020

Uh oh!

openshift-cherrypick-robot commented Aug 17, 2020

Uh oh!

ecordell commented Aug 17, 2020

Uh oh!

openshift-ci-robot commented Aug 17, 2020

Uh oh!

njhale commented Aug 18, 2020

Uh oh!

openshift-cherrypick-robot commented Aug 18, 2020

Uh oh!

dinhxuanvu commented Aug 18, 2020

Uh oh!

openshift-bot commented Aug 19, 2020

Uh oh!

openshift-bot commented Aug 19, 2020

Uh oh!

openshift-bot commented Aug 19, 2020

Uh oh!

openshift-bot commented Aug 20, 2020

Uh oh!

openshift-bot commented Aug 20, 2020

Uh oh!

openshift-ci-robot commented Aug 20, 2020

Uh oh!

openshift-cherrypick-robot commented Aug 20, 2020

Uh oh!

Uh oh!