Skip to content

[release-4.15] OCPBUGS-25798: Fix snapshot failure, backport e2es #670

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
Merged
merged 4 commits into from
Jan 26, 2024
Merged

[release-4.15] OCPBUGS-25798: Fix snapshot failure, backport e2es #670

merged 4 commits into from
Jan 26, 2024

Conversation

kevinrizza
Copy link
Member

@kevinrizza kevinrizza commented Jan 24, 2024 •
edited
Loading

This pr fixes an issue with deprecation propogation with certain operatorgroup contexts

Additionally, this pr pulls in a set of e2e improvements to increase our signal for release backports

dtfranz and others added 4 commits January 24, 2024 10:48
@dtfranz @kevinrizza
Improve condition check for installplan (#3145)
79f565e 
Signed-off-by: Daniel Franz <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6b6e3fbd724ddb6bfb1e31f75d3cac2a25cc5b86
@tmshort @kevinrizza
Fix Create InstallPlan with Permissions test (#3129)
8e8426b 
Fix #3108
The Subscription needs to be deleted before deleting the CSV, otherwise
the Subscription will recreate the CSV, and subsequently, the CR/CRBs
are not deleted.

Update some test logging as well.

Signed-off-by: Todd Short <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 8215c7f3fe16b1135ddfc9de1d498fff2f75e659
@dtfranz @kevinrizza
Fix snapshot failure when catalogSourceNamespace does not contain Ope…
dadbd65 
…ratorGroup. (#3149)

Signed-off-by: Daniel Franz <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 8eb16f7a9e12be729e07207983d27af78c23695b
@tmshort @kevinrizza
Fix Condition check for Reconcile InstallPlan status (#3153)
2b9b74f 
Fix #3151

Remove non-InstallPlan related checks for this test.

Also:
* Clean up some looping log messages
* Clean up some logging added when comments were converted

These comments/logs are at the beginning of the test, and are also part
of the test sequence, so they are redundant (and possibly confusing)

Signed-off-by: Todd Short <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 5299830576c8e8e6cd728b08a3a2e60f212ba387
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 24, 2024
@openshift-ci-robot
Copy link

@kevinrizza: This pull request explicitly references no jira issue.

In response to this:

This pr pulls in a set of e2e improvements to increase our signal for release backports

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 review from joelanford and oceanc80 January 24, 2024 15:53
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 24, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kevinrizza

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 Jan 24, 2024
@dtfranz
Copy link
Contributor

dtfranz commented Jan 24, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 24, 2024
@kevinrizza
Copy link
Member Author

these test failures seem unrelated to the pull request

/test e2e-gcp-ovn

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 24, 2024

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

@dtfranz
Copy link
Contributor

dtfranz commented Jan 24, 2024

@Xia-Zhao-rh , this PR contains both #666 and e2e fixes required to enable us to merge changes to 4.15. Would you also mind giving your labels here?

@kevinrizza
Copy link
Member Author

/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 Jan 25, 2024
@kevinrizza kevinrizza changed the title [release-4.15] NO-ISSUE: Backport e2es [release-4.15] OCPBUGS-25798: Fix snapshot failure, backport e2es Jan 25, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jan 25, 2024
@openshift-ci-robot
Copy link

@kevinrizza: This pull request references Jira Issue OCPBUGS-25798, 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-24526 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-24526 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 @Xia-Zhao-rh

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

In response to this:

This pr pulls in a set of e2e improvements to increase our signal for release backports

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 Xia-Zhao-rh January 25, 2024 19:36
@Xia-Zhao-rh
Copy link

/label cherry-pick-approved

@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 Jan 26, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit fc6550c into openshift:release-4.15 Jan 26, 2024
@openshift-ci-robot
Copy link

@kevinrizza: Jira Issue OCPBUGS-25798: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

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

In response to this:

This pr fixes an issue with deprecation propogation with certain operatorgroup contexts

Additionally, this pr pulls in a set of e2e improvements to increase our signal for release backports

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.

@dtfranz dtfranz mentioned this pull request Jan 26, 2024
Closed
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Jan 26, 2024
@openshift-merge-bot
Merge pull request openshift#670 from kevinrizza/backport-e2es
b54d96b 
[release-4.15] OCPBUGS-25798: Fix snapshot failure, backport e2es
@perdasilva perdasilva mentioned this pull request Feb 14, 2024
Merged
@perdasilva
Copy link
Contributor

/cherry-pick release-4.14

@openshift-cherrypick-robot
Copy link

@perdasilva: #670 failed to apply on top of branch "release-4.14":

Applying: Improve condition check for installplan (#3145)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/test/e2e/subscription_e2e_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 Improve condition check for installplan (#3145)
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.14

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.

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

@oceanc80 oceanc80 Awaiting requested review from oceanc80

@Xia-Zhao-rh Xia-Zhao-rh Awaiting requested review from Xia-Zhao-rh

Assignees

@bandrade bandrade

@dtfranz dtfranz

@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/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.