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.

Sign up for GitHub

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

Jump to bottom

OCPBUGS-29116: [release-4.15]: Clear (existing) error cond from Subscription, once error resolved #684

Merged
merged 2 commits into from Feb 7, 2024
Merged

OCPBUGS-29116: [release-4.15]: Clear (existing) error cond from Subscription, once error resolved #684

merged 2 commits into from Feb 7, 2024

Conversation

anik120
Copy link
Contributor

@anik120 anik120 commented Feb 6, 2024

No description provided.

@anik120
Clear (existing) error cond from Subscription, once error resolved (#…
1bd293d 
…3166)

The func `removeSubsCond` takes in a list of pointers to Subscription objects, modifies the
objects that the pointers point to, but return a new list of those pointers. A [PR](operator-framework/operator-lifecycle-manager#2942) included in
the v0.25.0 release [changed the way the output of that function was being used](https://github.com/operator-framework/operator-lifecycle-manager/pull/2942/files#diff-a1760d9b7ac1e93734eea675d8d8938c96a50e995434b163c6f77c91bace9990R1146-R1155) leading to a regression. This PR fixes the `removeSubsCond` function,
fixing the regression as a result.

Closes #3162

Signed-off-by: Anik Bhattacharjee <anbhatta@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 54da66a9996632315827ba37e14823de6405b4d9
@anik120
Reflect BundleUnpacking cond removal in missed e2e test (#3170)
bcb66cb 
PR #3166 removes the `BundleUnpacking` condition once resolution is successful.
PR #3166 [modified an e2e test](operator-framework/operator-lifecycle-manager@54da66a#diff-11f70fc71ac22d725767916f562789de88d06eb9ebe19f337a59fd7035a3ca2dR2448) to reflect that change.
However, the test being fixed in this PR is skipped for upstream, and runs only
downstream.This PR is a follow up to #3166 to reflect the `BundleUnpacking` condition
removal in the remaining test.

Signed-off-by: Anik Bhattacharjee <anbhatta@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6e3f051a4d9ac32222a051029570b88c8ba9e4f6
@anik120 anik120 changed the title Res err bug backport 4.15 [release-4.15]: Clear (existing) error cond from Subscription, once error resolved Feb 6, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anik120

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 6, 2024
@anik120
Copy link
Contributor Author

anik120 commented Feb 6, 2024

/jira cherrypick OCPBUGS-24587

@openshift-ci-robot
Copy link

@anik120: Jira Issue OCPBUGS-24587 has been cloned as Jira Issue OCPBUGS-29116. Will retitle bug to link to clone.
/retitle OCPBUGS-29116: [release-4.15]: Clear (existing) error cond from Subscription, once error resolved

In response to this:

/jira cherrypick OCPBUGS-24587

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot changed the title [release-4.15]: Clear (existing) error cond from Subscription, once error resolved OCPBUGS-29116: [release-4.15]: Clear (existing) error cond from Subscription, once error resolved Feb 6, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Feb 6, 2024
@openshift-ci-robot
Copy link

@anik120: This pull request references Jira Issue OCPBUGS-29116, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-24587 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-24587 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

@kevinrizza
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 6, 2024
@oceanc80
Copy link
Contributor

oceanc80 commented Feb 6, 2024

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Feb 6, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 6, 2024

@anik120: 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 bcb66cb link false /test e2e-gcp-olm-flaky

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.

@KeenonLee
Copy link
Member

/retest-required

@kuiwang02
Copy link

/label cherry-pick-approved
/label qe-approved

@openshift-ci openshift-ci bot added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. qe-approved Signifies that QE has signed off on this PR labels Feb 7, 2024
@openshift-ci-robot
Copy link

@anik120: This pull request references Jira Issue OCPBUGS-29116, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-24587 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-24587 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

Requesting review from QA contact:
/cc @kuiwang02

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from kuiwang02 February 7, 2024 06:18
@openshift-merge-bot openshift-merge-bot bot merged commit 4ffebf7 into openshift:release-4.15 Feb 7, 2024
12 of 13 checks passed
@openshift-ci-robot
Copy link

@anik120: Jira Issue OCPBUGS-29116: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-29116 has been moved to the MODIFIED state.

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-lifecycle-manager-container-v4.15.0-202402070737.p0.g4ffebf7.assembly.stream.el9 for distgit operator-lifecycle-manager.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joelanford joelanford Awaiting requested review from joelanford

@kevinrizza kevinrizza Awaiting requested review from kevinrizza

@jianzhangbjz jianzhangbjz Awaiting requested review from jianzhangbjz

@kuiwang02 kuiwang02 Awaiting requested review from kuiwang02

Assignees

@bandrade bandrade

@kevinrizza kevinrizza

@jianzhangbjz jianzhangbjz

@emmajiafan emmajiafan

@kuiwang02 kuiwang02

@Xia-Zhao-rh Xia-Zhao-rh

@KeenonLee KeenonLee

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet