Bug 2097557: use env var for OCP version instead of clusterversion status

[tylerslaton]

Get the current OpenShift release version from the RELEASE_VERSION
environment variable since the behavior of the original source --
the ClusterVersion desired release status field -- has changed.

Signed-off-by: Tyler Slaton [email protected]
Co-authored-by: Nick Hale [email protected]
Upstream-repository: operator-lifecycle-manager
Upstream-commmit: ec9903dba891dc5fd4e42bd06b240a7a82f9283c

[openshift-ci]

@tylerslaton: This pull request references Bugzilla bug 2097557, 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.12.0) matches configured target release for branch (4.12.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

Bug 2097557: use env var for OCP version instead of clusterversion status

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: timflannagan, tylerslaton

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 [timflannagan]

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

[openshift-ci]

@tylerslaton: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

[timflannagan]

/lgtm

[openshift-ci]

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

• openshift/operator-framework-olm#346

Bugzilla bug 2097557 has been moved to the MODIFIED state.

In response to this:

Bug 2097557: use env var for OCP version instead of clusterversion status

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.

[tylerslaton]

/cherry-pick release-4.11

[openshift-cherrypick-robot]

@tylerslaton: new pull request created: #347

In response to this:

/cherry-pick release-4.11

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.

[tylerslaton]

/cherry-pick release-4.10

[openshift-cherrypick-robot]

@tylerslaton: #346 failed to apply on top of branch "release-4.10":

Applying: fix(openshift): use env var instead of clusterversion status (#2817)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/pkg/controller/operators/openshift/clusteroperator_controller_test.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/openshift/helpers.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/openshift/helpers_test.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/openshift/options.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/openshift/helpers.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/openshift/options.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/openshift/options.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/openshift/helpers.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/openshift/helpers.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/openshift/options.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/openshift/helpers_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/openshift/helpers.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/openshift/helpers.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/openshift/clusteroperator_controller_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/openshift/clusteroperator_controller_test.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(openshift): use env var instead of clusterversion status (#2817)
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.10

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.