Skip to content

NO-ISSUE: [release-4.14] Backport e2e fixes to 4.14 #674

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

Merged

Conversation

perdasilva
Copy link
Contributor

@perdasilva perdasilva commented Jan 26, 2024

e2e-test backport based on #670 + another fix for a CRD flake test

This PR only changes e2e tests in an effort to make CI more reliable and reduce our time-to-merge.

This PR does not carry the bug fix from #670 - product changes are to be made by this PR.

Reviewers: please ensure all changes are under staging/operator-lifecycle-manager/test

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 26, 2024
@openshift-ci openshift-ci bot requested review from anik120 and grokspawn January 26, 2024 14:02
Copy link
Contributor

openshift-ci bot commented Jan 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: perdasilva

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 26, 2024
@perdasilva perdasilva force-pushed the perdasilva/backport-e2e branch from b54d96b to 807dac9 Compare February 1, 2024 13:15
@kevinrizza
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 1, 2024
@perdasilva perdasilva force-pushed the perdasilva/backport-e2e branch from 8f56d6d to 5a081f0 Compare February 1, 2024 16:42
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 1, 2024
Copy link
Contributor

openshift-ci bot commented Feb 1, 2024

New changes are detected. LGTM label has been removed.

@perdasilva perdasilva force-pushed the perdasilva/backport-e2e branch 2 times, most recently from 9cf34d1 to f39517c Compare February 2, 2024 13:13
@perdasilva
Copy link
Contributor Author

/retest

1 similar comment
@perdasilva
Copy link
Contributor Author

/retest

@perdasilva perdasilva force-pushed the perdasilva/backport-e2e branch from f39517c to c7d2b42 Compare February 7, 2024 13:03
@perdasilva
Copy link
Contributor Author

/retest

stevekuznetsov and others added 3 commits February 8, 2024 10:55
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 <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 935fc47c13f21e505e1f52e82faeaccd70861425
Signed-off-by: Daniel Franz <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6b6e3fbd724ddb6bfb1e31f75d3cac2a25cc5b86
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
@perdasilva perdasilva force-pushed the perdasilva/backport-e2e branch from c7d2b42 to 9a51030 Compare February 8, 2024 12:23
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
@perdasilva perdasilva force-pushed the perdasilva/backport-e2e branch from 9a51030 to e49a97c Compare February 8, 2024 17:48
Signed-off-by: Per Goncalves da Silva <[email protected]>
Co-authored-by: Per Goncalves da Silva <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 85d9de20d53b025ed62ec2fa0ab7fd8980669fb8
@perdasilva perdasilva force-pushed the perdasilva/backport-e2e branch from f5fc43b to 55e6a18 Compare February 14, 2024 21:08
Copy link
Contributor

openshift-ci bot commented Feb 15, 2024

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

@perdasilva perdasilva changed the title [WIP] Backport e2e fixes to 4.14 NO-ISSUEL: [release-4.14] Backport e2e fixes to 4.14 Feb 15, 2024
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 15, 2024
@perdasilva perdasilva changed the title NO-ISSUEL: [release-4.14] Backport e2e fixes to 4.14 NO-ISSUE: [release-4.14] Backport e2e fixes to 4.14 Feb 15, 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 15, 2024
@openshift-ci-robot
Copy link

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

In response to this:

Fixed backport of #670

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.

@joelanford
Copy link
Member

/backport-risk-assessed

This PR contains no changes to product code, so this is a no-op for QE. Adding that label as well.
/cherry-pick-approved

@kevinrizza kevinrizza added lgtm Indicates that a PR is ready to be merged. 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. labels Feb 15, 2024
@kevinrizza kevinrizza added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Feb 15, 2024
@joelanford
Copy link
Member

Forgot one!

/label jira/valid-bug

@openshift-merge-bot openshift-merge-bot bot merged commit 84c3b96 into openshift:release-4.14 Feb 15, 2024
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-registry-container-v4.14.0-202402151739.p0.g84c3b96.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-202402151739.p0.g84c3b96.assembly.stream.el8 for distgit operator-lifecycle-manager.
All builds following this will include this PR.

@perdasilva
Copy link
Contributor Author

/cherry-pick release-4.13

@openshift-cherrypick-robot

@perdasilva: #674 failed to apply on top of branch "release-4.13":

Applying: test/e2e: don't use internal versions of api extensions
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/test/e2e/catalog_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/crd_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/metrics_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/operator_condition_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/operator_groups_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/util.go
M	staging/operator-lifecycle-manager/test/e2e/webhook_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging staging/operator-lifecycle-manager/test/e2e/webhook_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/util.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/operator_groups_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/operator_condition_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/metrics_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/crd_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/catalog_e2e_test.go
Applying: Improve condition check for installplan (#3145)
Applying: Fix Create InstallPlan with Permissions test (#3129)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/util.go
Falling back to patching base and 3-way merge...
Auto-merging staging/operator-lifecycle-manager/test/e2e/util.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/test/e2e/csv_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 0003 Fix Create InstallPlan with Permissions test (#3129)
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.13

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.

perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Sep 26, 2024
NO-ISSUE: [release-4.14] Backport e2e fixes to 4.14
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Sep 26, 2024
NO-ISSUE: [release-4.14] Backport e2e fixes to 4.14
@perdasilva
Copy link
Contributor Author

/cherry-pick release-4.13

@openshift-cherrypick-robot

@perdasilva: #674 failed to apply on top of branch "release-4.13":

Applying: test/e2e: don't use internal versions of api extensions
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/test/e2e/catalog_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/crd_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/metrics_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/operator_condition_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/operator_groups_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/util.go
M	staging/operator-lifecycle-manager/test/e2e/webhook_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging staging/operator-lifecycle-manager/test/e2e/webhook_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/util.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/operator_groups_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/operator_condition_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/metrics_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/crd_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/catalog_e2e_test.go
Applying: Improve condition check for installplan (#3145)
Applying: Fix Create InstallPlan with Permissions test (#3129)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/util.go
Falling back to patching base and 3-way merge...
Auto-merging staging/operator-lifecycle-manager/test/e2e/util.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0003 Fix Create InstallPlan with Permissions test (#3129)

In response to this:

/cherry-pick release-4.13

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.

perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Oct 8, 2024
NO-ISSUE: [release-4.14] Backport e2e fixes to 4.14
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.