[release-4.11] Bug 2114574: use env var for OCP version instead of clusterversion status by openshift-cherrypick-robot · Pull Request #347 · openshift/operator-framework-olm

openshift-cherrypick-robot · 2022-08-02T20:26:18Z

This is an automated cherry-pick of #346

/assign 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 <tyslaton@redhat.com> Co-authored-by: Nick Hale <njohnhale@gmail.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: ec9903dba891dc5fd4e42bd06b240a7a82f9283c

openshift-ci · 2022-08-02T20:26:37Z

@openshift-cherrypick-robot: Bugzilla bug 2097557 has been cloned as Bugzilla bug 2114574. Retitling PR to link against new bug.
/retitle [release-4.11] Bug 2114574: use env var for OCP version instead of clusterversion status

Details

In response to this:

[release-4.11] 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 · 2022-08-02T20:26:53Z

@openshift-cherrypick-robot: This pull request references Bugzilla bug 2114574, 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.11.0) matches configured target release for branch (4.11.0)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 2097557 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Bugzilla bug 2097557 targets the "4.12.0" release, which is one of the valid target releases: 4.12.0
bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

Details

In response to this:

[release-4.11] Bug 2114574: 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 · 2022-08-03T13:49:08Z

/retest

tylerslaton · 2022-08-03T14:36:26Z

/retest

tylerslaton · 2022-08-03T16:30:56Z

/retest

tylerslaton · 2022-08-03T17:49:59Z

/retest

tylerslaton · 2022-08-04T13:35:20Z

/retest

tylerslaton · 2022-08-04T14:54:28Z

/retest

jianzhangbjz · 2022-08-05T07:16:13Z

/bug refresh

tylerslaton · 2022-08-05T15:09:56Z

/retest

tylerslaton · 2022-08-05T18:21:10Z

/bugzilla refresh

openshift-ci · 2022-08-05T18:22:29Z

@tylerslaton: This pull request references Bugzilla bug 2114574, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.11.0) matches configured target release for branch (4.11.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 2097557 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Bugzilla bug 2097557 targets the "4.12.0" release, which is one of the valid target releases: 4.12.0
bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

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.

tylerslaton · 2022-08-05T18:25:00Z

/retest

jianzhangbjz · 2022-08-08T08:28:22Z

/bugzilla refresh

openshift-ci · 2022-08-08T08:28:27Z

@jianzhangbjz: This pull request references Bugzilla bug 2114574, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.11.0) matches configured target release for branch (4.11.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 2097557 is in the state VERIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Bugzilla bug 2097557 targets the "4.12.0" release, which is one of the valid target releases: 4.12.0
bug has dependents

Requesting review from QA contact:
/cc @kuiwang02

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.

tylerslaton · 2022-08-08T15:36:51Z

/retest

exdx

/lgtm

dinhxuanvu

/approve

openshift-ci · 2022-08-10T18:42:55Z

[APPROVALNOTIFIER] This PR is APPROVED

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

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:

~~OWNERS~~ [dinhxuanvu]

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

perdasilva · 2022-08-11T08:53:41Z

/label backport-risk-assessed

jianzhangbjz · 2022-08-15T09:43:06Z

/label cherry-pick-approved

openshift-ci-robot · 2022-08-15T11:51:13Z

/retest-required

Remaining retests: 2 against base HEAD 8e85433 and 8 for PR HEAD 8bac397 in total

openshift-ci-robot · 2022-08-15T12:09:19Z

/retest-required

Remaining retests: 1 against base HEAD 8e85433 and 7 for PR HEAD 8bac397 in total

openshift-ci · 2022-08-15T14:06:29Z

@openshift-cherrypick-robot: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-gcp-olm-flaky	`8bac397`	link	false	`/test e2e-gcp-olm-flaky`

Full PR test history. Your PR dashboard.

Details

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.

openshift-ci-robot · 2022-08-15T14:11:39Z

/retest-required

Remaining retests: 0 against base HEAD 8e85433 and 6 for PR HEAD 8bac397 in total

openshift-ci · 2022-08-15T15:44:09Z

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

openshift/operator-framework-olm#347

Bugzilla bug 2114574 has been moved to the MODIFIED state.

Details

In response to this:

[release-4.11] Bug 2114574: 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 · 2022-08-15T17:56:03Z

/cherry-pick release-4.10

openshift-cherrypick-robot · 2022-08-15T17:56:44Z

@tylerslaton: #347 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".

Details

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.

openshift-ci Bot assigned tylerslaton Aug 2, 2022

openshift-cherrypick-robot mentioned this pull request Aug 2, 2022

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

Merged

openshift-ci Bot changed the title ~~[release-4.11] Bug 2097557: use env var for OCP version instead of clusterversion status~~ [release-4.11] Bug 2114574: use env var for OCP version instead of clusterversion status Aug 2, 2022

openshift-ci Bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high 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 Aug 2, 2022

openshift-ci Bot requested review from exdx, jianzhangbjz and kevinrizza August 2, 2022 20:26

openshift-ci Bot requested a review from kuiwang02 August 8, 2022 08:28

exdx reviewed Aug 10, 2022

View reviewed changes

openshift-ci Bot assigned exdx Aug 10, 2022

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 10, 2022

dinhxuanvu approved these changes Aug 10, 2022

View reviewed changes

openshift-ci Bot assigned dinhxuanvu Aug 10, 2022

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 10, 2022

openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Aug 11, 2022

openshift-ci Bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Aug 15, 2022

openshift-merge-robot merged commit 2d571d3 into openshift:release-4.11 Aug 15, 2022

timflannagan mentioned this pull request Sep 20, 2022

OCPBUGS-2898: [release-4.10] fix(openshift): use env var instead of clusterversion status (#2817) #389

Merged

Conversation

openshift-cherrypick-robot commented Aug 2, 2022

Uh oh!

openshift-ci Bot commented Aug 2, 2022

Uh oh!

openshift-ci Bot commented Aug 2, 2022

Uh oh!

tylerslaton commented Aug 3, 2022

Uh oh!

tylerslaton commented Aug 3, 2022

Uh oh!

tylerslaton commented Aug 3, 2022

Uh oh!

tylerslaton commented Aug 3, 2022

Uh oh!

tylerslaton commented Aug 4, 2022

Uh oh!

tylerslaton commented Aug 4, 2022

Uh oh!

jianzhangbjz commented Aug 5, 2022

Uh oh!

tylerslaton commented Aug 5, 2022

Uh oh!

tylerslaton commented Aug 5, 2022

Uh oh!

openshift-ci Bot commented Aug 5, 2022

Uh oh!

tylerslaton commented Aug 5, 2022

Uh oh!

jianzhangbjz commented Aug 8, 2022

Uh oh!

openshift-ci Bot commented Aug 8, 2022

Uh oh!

tylerslaton commented Aug 8, 2022

Uh oh!

exdx left a comment

Choose a reason for hiding this comment

Uh oh!

dinhxuanvu left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Aug 10, 2022

Uh oh!

perdasilva commented Aug 11, 2022

Uh oh!

jianzhangbjz commented Aug 15, 2022

Uh oh!

openshift-ci-robot commented Aug 15, 2022

Uh oh!

openshift-ci-robot commented Aug 15, 2022

Uh oh!

openshift-ci Bot commented Aug 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Aug 15, 2022

Uh oh!

openshift-ci Bot commented Aug 15, 2022

Uh oh!

tylerslaton commented Aug 15, 2022

Uh oh!

openshift-cherrypick-robot commented Aug 15, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

openshift-ci Bot commented Aug 15, 2022 •

edited

Loading