Skip to content

[release-1.30] Adapt TLSAdherence test to support OCP 5.0+ - #2341

Open
mkralik3 wants to merge 4 commits into
istio-ecosystem:release-1.30from
mkralik3:backport_upstream_r_1_30
Open

mkralik3 wants to merge 4 commits into
istio-ecosystem:release-1.30from
mkralik3:backport_upstream_r_1_30

Conversation

@mkralik3

Copy link
Copy Markdown
Contributor

Backport of #2315 and related commits

nrfox and others added 3 commits September 16, 2026 14:05
Provides more obvious warning to users about side effects than just a
comment.

Signed-off-by: Nick Fox <nfox@redhat.com>
* Fix webhook flake

Wait for resources to be deleted between test runs.

Signed-off-by: Nick Fox <nfox@redhat.com>

* Rework how operator tests are skipped

Ginkgo Skip was pushing the DeferCleanup step in the Operator test
container to run after the webhook test causing the BeforeAll resources
created in the webhook tests to be deleted by the cleaner.

Signed-off-by: Nick Fox <nfox@redhat.com>

---------

Signed-off-by: Nick Fox <nfox@redhat.com>
(cherry picked from commit c60358c)
Signed-off-by: mkralik3 <mkralik@redhat.com>
Adapt TLSAdherence test to support OCP 5.0+

Signed-off-by: mkralik3 <mkralik@redhat.com>
(cherry picked from commit abf4ee2)
Signed-off-by: mkralik3 <mkralik@redhat.com>
@mkralik3
mkralik3 requested a review from a team as a code owner September 16, 2026 12:14
Currently, during e2e test failure, logs gathering happens in "AfterAll"
section.
But since within the tests, many nested "When" blocks have "BeforeEach"
section, when the test fails, ginkgo goes to the next "When" section and
executes the "BeforeEach" section there, which leas to a cleanup of
different resource, depends on the cleanup steps within specifc section.

That leads to a state, when many gathered logs are empty, since the
requested resource already deleted.
That state, makes debugging harded.

Move the logs gathering step to the "JustAfterEach" section.
It will capture debug info immediately on test failure
(before any cleanup or next BeforeEach runs).

Signed-off-by: Maxim Babushkin <mbabushk@redhat.com>
@istio-testing

Copy link
Copy Markdown
Collaborator

@mkralik3: 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
e2e-kind-multicluster_sail-operator_release-1.30 193c7e7 link true /test e2e-kind-multicluster
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.

Comment on lines +222 to +231
// Calling Skip() from a BeforeAll makes Ginkgo defer the enclosing Ordered container's
// teardown (the cleaner) into the next top-level container, or drop it entirely. The
// cleaner then deletes resources belonging to whichever suite is running by then. So the
// checks below record why the specs cannot run and return, and each It skips itself.
var skipReason string
skipIfUnsupported := func() {
if skipReason != "" {
Skip(skipReason)
}
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I'm not sure the webhook flake commit is necessary since the webhook tests were only added to 1.31 but it won't hurt to keep the tls adherence test consistent between branches.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants