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.

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

OCPBUGS-29192: [release-4.14]: Clear (existing) error cond from Subscription, once error resolved #686

Merged
merged 2 commits into from Feb 21, 2024

Conversation

anik120
Copy link
Contributor

@anik120 anik120 commented Feb 7, 2024

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 included in the v0.25.0 release changed the way the output of that function was being used leading to a regression. This PR fixes the removeSubsCond function, fixing the regression as a result.

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 54da66a9996632315827ba37e14823de6405b4d9

@anik120
Copy link
Contributor Author

anik120 commented Feb 7, 2024

/jira cherry-pick OCPBUGS-29116

@openshift-ci-robot
Copy link

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

In response to this:

/jira cherry-pick OCPBUGS-29116

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.14]: Clear (existing) error cond from Subscription, once error resolved OCPBUGS-29192: [release-4.14]: Clear (existing) error cond from Subscription, once error resolved Feb 7, 2024
Copy link
Contributor

openshift-ci bot commented Feb 7, 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 7, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 7, 2024
@openshift-ci-robot
Copy link

@anik120: This pull request references Jira Issue OCPBUGS-29192, 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.14.z) matches configured target version for branch (4.14.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-29116 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-29116 targets the "4.15.0" version, which is one of the valid target versions: 4.15.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:

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 included in the v0.25.0 release changed the way the output of that function was being used leading to a regression. This PR fixes the removeSubsCond function, fixing the regression as a result.

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 54da66a9996632315827ba37e14823de6405b4d9

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-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Feb 7, 2024
@grokspawn
Copy link
Contributor

/lgtm

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

oceanc80 commented Feb 7, 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 7, 2024
@jianzhangbjz
Copy link
Contributor

Seems like no error message was reported when using a wrong catalog service, please have a look: https://issues.redhat.com/browse/OCPBUGS-29192
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 8, 2024
@anik120
Copy link
Contributor Author

anik120 commented Feb 9, 2024

@jianzhangbjz commented on the ticket, looks like the "patch service" method that was being used for testing needs to be adjusted. The service we're patching for testing is being reset back. More details on the ticket.

@jianzhangbjz
Copy link
Contributor

Hi @anik120 , thanks! Comments left there.

@jianzhangbjz
Copy link
Contributor

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 20, 2024
@jianzhangbjz
Copy link
Contributor

@openshift-ci 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 Feb 20, 2024
@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Feb 20, 2024
@openshift-ci-robot
Copy link

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.z) matches configured target version for branch (4.14.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-29116 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-29116 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
  • bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

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 included in the v0.25.0 release changed the way the output of that function was being used leading to a regression. This PR fixes the removeSubsCond function, fixing the regression as a result.

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 54da66a9996632315827ba37e14823de6405b4d9

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-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD c6e9911 and 2 for PR HEAD d8bed00 in total

@anik120
Copy link
Contributor Author

anik120 commented Feb 20, 2024

/retest

…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
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
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 20, 2024
@anik120
Copy link
Contributor Author

anik120 commented Feb 20, 2024

@grokspawn had to rebase to include this commit which went in since the last time you'd lgtm-ed it, and include this commit for the backport too. Looking for an lgtm again, thank you!

@anik120
Copy link
Contributor Author

anik120 commented Feb 20, 2024

/test e2e-gcp-ovn

@anik120
Copy link
Contributor Author

anik120 commented Feb 21, 2024

/test e2e-gcp-olm

Copy link
Contributor

openshift-ci bot commented Feb 21, 2024

@anik120: 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.

@grokspawn
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 21, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 8e6f9eb into openshift:release-4.14 Feb 21, 2024
13 checks passed
@openshift-ci-robot
Copy link

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

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

In response to this:

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 included in the v0.25.0 release changed the way the output of that function was being used leading to a regression. This PR fixes the removeSubsCond function, fixing the regression as a result.

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 54da66a9996632315827ba37e14823de6405b4d9

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-registry-container-v4.14.0-202402211439.p0.g8e6f9eb.assembly.stream.el8 for distgit operator-registry.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-lifecycle-manager-container-v4.14.0-202402211439.p0.g8e6f9eb.assembly.stream.el8 for distgit operator-lifecycle-manager.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.14.0-0.nightly-2024-02-21-181159

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

None yet