Skip to content

NO-ISSUE: [release-4.12] Backport e2e fixes #880

Merged
openshift-merge-bot[bot] merged 5 commits intoopenshift:release-4.12from
perdasilva:perdasilva/backport-e2e-412
Oct 30, 2024
Merged

NO-ISSUE: [release-4.12] Backport e2e fixes #880
openshift-merge-bot[bot] merged 5 commits intoopenshift:release-4.12from
perdasilva:perdasilva/backport-e2e-412

Conversation

@perdasilva
Copy link
Copy Markdown
Contributor

@perdasilva perdasilva commented Oct 8, 2024 •
edited
Loading

Backport of #876

stevekuznetsov and others added 2 commits October 8, 2024 16:35
@stevekuznetsov
test/e2e: don't use internal versions of api extensions
6177b89 
The internal versions of the API Extensions client objects are what
client calls get converted into for processing within the server. This
mechanism allows many different clients to use many different
outward-facing versions, while the code within the server only ever runs
against one type. There is no utility to these types outside of the
server, especially for code that's making client calls. We can simply
use the client-facing types and not require coversion anywhere.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 935fc47c13f21e505e1f52e82faeaccd70861425
@dtfranz
Improve condition check for installplan (#3145)
63281c5 
Signed-off-by: Daniel Franz <dfranz@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6b6e3fbd724ddb6bfb1e31f75d3cac2a25cc5b86
@openshift-ci openshift-ci Bot requested review from anik120 and tmshort October 8, 2024 14:41
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 8, 2024
@perdasilva perdasilva changed the title e2e fixes backport 4.12 NO-ISSUE: [release-4.13] Backport e2e fixes to 4.12 Oct 8, 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 Oct 8, 2024
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Oct 8, 2024

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

Details

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.

@perdasilva perdasilva changed the title NO-ISSUE: [release-4.13] Backport e2e fixes to 4.12 NO-ISSUE: [release-4.12] Backport e2e fixes Oct 8, 2024
@perdasilva
Copy link
Copy Markdown
Contributor Author

perdasilva commented Oct 8, 2024

/retest

@perdasilva perdasilva force-pushed the perdasilva/backport-e2e-412 branch 2 times, most recently from 3933d97 to adca8c1 Compare October 10, 2024 13:07
@tmshort
Fix Create InstallPlan with Permissions test (#3129)
7523969 
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 <todd.short@me.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 8215c7f3fe16b1135ddfc9de1d498fff2f75e659
@perdasilva perdasilva force-pushed the perdasilva/backport-e2e-412 branch from adca8c1 to c16497a Compare October 10, 2024 13:10
@perdasilva
Copy link
Copy Markdown
Contributor Author

perdasilva commented Oct 10, 2024

/retest

1 similar comment
@perdasilva
Copy link
Copy Markdown
Contributor Author

perdasilva commented Oct 11, 2024

/retest

@perdasilva perdasilva force-pushed the perdasilva/backport-e2e-412 branch from c16497a to 7cdb129 Compare October 11, 2024 12:31
@perdasilva
Copy link
Copy Markdown
Contributor Author

perdasilva commented Oct 11, 2024

/retest

1 similar comment
@perdasilva
Copy link
Copy Markdown
Contributor Author

perdasilva commented Oct 14, 2024

/retest

tmshort and others added 2 commits October 15, 2024 08:44
@tmshort
Fix Condition check for Reconcile InstallPlan status (#3153)
2ab5f32 
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 <todd.short@me.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 5299830576c8e8e6cd728b08a3a2e60f212ba387
@perdasilva
fix crd data loss e2e test (#3173)
c6b2e2f 
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 85d9de20d53b025ed62ec2fa0ab7fd8980669fb8
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
@perdasilva perdasilva force-pushed the perdasilva/backport-e2e-412 branch from 7cdb129 to c6b2e2f Compare October 15, 2024 06:44
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 15, 2024

@perdasilva: all tests passed!

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

@perdasilva
Copy link
Copy Markdown
Contributor Author

perdasilva commented Oct 15, 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 Oct 15, 2024
tmshort
tmshort approved these changes Oct 15, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@tmshort tmshort left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Oct 15, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: perdasilva, tmshort

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:

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

@joelanford
Copy link
Copy Markdown
Member

joelanford commented Oct 16, 2024

Manually adding valid-bug label because these e2e fixes should reduce flakes and therefore time-to-merge

/label jira/valid-bug

@openshift-ci openshift-ci Bot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Oct 16, 2024
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Oct 17, 2024

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

Retaining the jira/valid-bug label as it was manually added.

Details

In response to this:

Backport of #876

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.

@jianzhangbjz
Copy link
Copy Markdown
Contributor

jianzhangbjz commented Oct 30, 2024

/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 Oct 30, 2024
@openshift-merge-bot openshift-merge-bot Bot merged commit b7e63d6 into openshift:release-4.12 Oct 30, 2024
@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Oct 30, 2024

[ART PR BUILD NOTIFIER]

Distgit: operator-lifecycle-manager
This PR has been included in build operator-lifecycle-manager-container-v4.12.0-202410300932.p0.gb7e63d6.assembly.stream.el8.
All builds following this will include this PR.

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Oct 30, 2024

[ART PR BUILD NOTIFIER]

Distgit: operator-registry
This PR has been included in build operator-registry-container-v4.12.0-202410300932.p0.gb7e63d6.assembly.stream.el8.
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

@anik120 anik120 Awaiting requested review from anik120

1 more reviewer

@tmshort tmshort tmshort approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@bandrade bandrade

@tmshort tmshort

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.