Skip to content

Fix cleanup in multicluster tests#909

Merged
istio-testing merged 1 commit intoistio-ecosystem:mainfrom
mkolesnik:fix-mc-aftersuite
Jun 16, 2025
Merged

Fix cleanup in multicluster tests#909
istio-testing merged 1 commit intoistio-ecosystem:mainfrom
mkolesnik:fix-mc-aftersuite

Conversation

@mkolesnik
Copy link
Copy Markdown
Collaborator

@mkolesnik mkolesnik commented Jun 15, 2025 •
edited
Loading

The cleanup effectively ignored the KEEP_ON_FAILURE flag since CurrentSpecReport() at this level doesn't return any usable information since all the tests have finished.

Instead, we use ReportAfterSuite which recieves a concentrated report and can tell if the suite has passed or failed.

What type of PR is this?

  • Enhancement / New Feature
  • Bug Fix
  • Refactor
  • Optimization
  • Test
  • Documentation Update

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Related Issue/PR #

Additional information:

@mkolesnik
Fix cleanup in multicluster tests
f9c68b2 
The cleanup effectively ignored the `KEEP_ON_FAILURE` flag since
`CurrentSpecReport()` at this level doesn't return any usable
information since all the tests have finished.

Instead, we use `ReportAfterSuite` which recieves a concentrated report
and can tell if the suite has passed or failed.

Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
@mkolesnik mkolesnik requested a review from a team as a code owner June 15, 2025 13:54
@codecov
Copy link
Copy Markdown

codecov bot commented Jun 15, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 76.27%. Comparing base (68156c0) to head (f9c68b2).
Report is 3 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #909      +/-   ##
==========================================
- Coverage   76.42%   76.27%   -0.15%     
==========================================
  Files          44       44              
  Lines        2685     2685              
==========================================
- Hits         2052     2048       -4     
- Misses        541      544       +3     
- Partials       92       93       +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

fjglira
fjglira approved these changes Jun 16, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@fjglira fjglira left a comment

Choose a reason for hiding this comment

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

Great :)

@istio-testing istio-testing merged commit bc8a715 into istio-ecosystem:main Jun 16, 2025
15 of 16 checks passed
sridhargaddam
sridhargaddam reviewed Jun 16, 2025
View reviewed changes
tests/e2e/multicluster/multicluster_suite_test.go

var _ = AfterSuite(func(ctx SpecContext) {
if CurrentSpecReport().Failed() {
var _ = ReportAfterSuite("Condiotnal cleanup", func(ctx SpecContext, r Report) {
Copy link
Copy Markdown
Contributor

@sridhargaddam sridhargaddam Jun 16, 2025

Choose a reason for hiding this comment

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

Pushed the following PR to fix the small typo: #911

openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 16, 2025
Automated merge
691eacb 
* upstream/main: (25 commits)
  Fix cleanup in multicluster tests (istio-ecosystem#909)
  Adding Eventually to Helm operator install (istio-ecosystem#907)
  Skip cleanup if control plane tests fail (istio-ecosystem#910)
  Use debug logging in integration tests (istio-ecosystem#906)
  Annotate only our clusters when using kind (istio-ecosystem#904)
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 16, 2025
Automated merge
02ef3a2 
* upstream/main: (27 commits)
  Revert "Disable imageDigest support in ztunnel controller (openshift-service-mesh#582)" (istio-ecosystem#905)
  Fix typo in the ReportAfterSuite text (istio-ecosystem#911)
  Fix cleanup in multicluster tests (istio-ecosystem#909)
  Adding Eventually to Helm operator install (istio-ecosystem#907)
  Skip cleanup if control plane tests fail (istio-ecosystem#910)
  Use debug logging in integration tests (istio-ecosystem#906)
  Annotate only our clusters when using kind (istio-ecosystem#904)
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 16, 2025
Automated merge
118ebbe 
* upstream/main: (27 commits)
  Revert "Disable imageDigest support in ztunnel controller (openshift-service-mesh#582)" (istio-ecosystem#905)
  Fix typo in the ReportAfterSuite text (istio-ecosystem#911)
  Fix cleanup in multicluster tests (istio-ecosystem#909)
  Adding Eventually to Helm operator install (istio-ecosystem#907)
  Skip cleanup if control plane tests fail (istio-ecosystem#910)
  Use debug logging in integration tests (istio-ecosystem#906)
  Annotate only our clusters when using kind (istio-ecosystem#904)
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 16, 2025
Automated merge
116df25 
* upstream/main: (27 commits)
  Revert "Disable imageDigest support in ztunnel controller (openshift-service-mesh#582)" (istio-ecosystem#905)
  Fix typo in the ReportAfterSuite text (istio-ecosystem#911)
  Fix cleanup in multicluster tests (istio-ecosystem#909)
  Adding Eventually to Helm operator install (istio-ecosystem#907)
  Skip cleanup if control plane tests fail (istio-ecosystem#910)
  Use debug logging in integration tests (istio-ecosystem#906)
  Annotate only our clusters when using kind (istio-ecosystem#904)
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 16, 2025
Automated merge
89823cd 
* upstream/main: (27 commits)
  Revert "Disable imageDigest support in ztunnel controller (openshift-service-mesh#582)" (istio-ecosystem#905)
  Fix typo in the ReportAfterSuite text (istio-ecosystem#911)
  Fix cleanup in multicluster tests (istio-ecosystem#909)
  Adding Eventually to Helm operator install (istio-ecosystem#907)
  Skip cleanup if control plane tests fail (istio-ecosystem#910)
  Use debug logging in integration tests (istio-ecosystem#906)
  Annotate only our clusters when using kind (istio-ecosystem#904)
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 17, 2025
Automated merge
e987afc 
* upstream/main: (27 commits)
  Revert "Disable imageDigest support in ztunnel controller (openshift-service-mesh#582)" (istio-ecosystem#905)
  Fix typo in the ReportAfterSuite text (istio-ecosystem#911)
  Fix cleanup in multicluster tests (istio-ecosystem#909)
  Adding Eventually to Helm operator install (istio-ecosystem#907)
  Skip cleanup if control plane tests fail (istio-ecosystem#910)
  Use debug logging in integration tests (istio-ecosystem#906)
  Annotate only our clusters when using kind (istio-ecosystem#904)
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 17, 2025
Automated merge
c5a591e 
* upstream/main: (27 commits)
  Revert "Disable imageDigest support in ztunnel controller (openshift-service-mesh#582)" (istio-ecosystem#905)
  Fix typo in the ReportAfterSuite text (istio-ecosystem#911)
  Fix cleanup in multicluster tests (istio-ecosystem#909)
  Adding Eventually to Helm operator install (istio-ecosystem#907)
  Skip cleanup if control plane tests fail (istio-ecosystem#910)
  Use debug logging in integration tests (istio-ecosystem#906)
  Annotate only our clusters when using kind (istio-ecosystem#904)
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 17, 2025
Automated merge
3d1dd9b 
* upstream/main: (27 commits)
  Revert "Disable imageDigest support in ztunnel controller (openshift-service-mesh#582)" (istio-ecosystem#905)
  Fix typo in the ReportAfterSuite text (istio-ecosystem#911)
  Fix cleanup in multicluster tests (istio-ecosystem#909)
  Adding Eventually to Helm operator install (istio-ecosystem#907)
  Skip cleanup if control plane tests fail (istio-ecosystem#910)
  Use debug logging in integration tests (istio-ecosystem#906)
  Annotate only our clusters when using kind (istio-ecosystem#904)
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 17, 2025
Automated merge
d76ec27 
* upstream/main: (27 commits)
  Revert "Disable imageDigest support in ztunnel controller (openshift-service-mesh#582)" (istio-ecosystem#905)
  Fix typo in the ReportAfterSuite text (istio-ecosystem#911)
  Fix cleanup in multicluster tests (istio-ecosystem#909)
  Adding Eventually to Helm operator install (istio-ecosystem#907)
  Skip cleanup if control plane tests fail (istio-ecosystem#910)
  Use debug logging in integration tests (istio-ecosystem#906)
  Annotate only our clusters when using kind (istio-ecosystem#904)
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 18, 2025
Automated merge
164ed4b 
* upstream/main: (27 commits)
  Revert "Disable imageDigest support in ztunnel controller (openshift-service-mesh#582)" (istio-ecosystem#905)
  Fix typo in the ReportAfterSuite text (istio-ecosystem#911)
  Fix cleanup in multicluster tests (istio-ecosystem#909)
  Adding Eventually to Helm operator install (istio-ecosystem#907)
  Skip cleanup if control plane tests fail (istio-ecosystem#910)
  Use debug logging in integration tests (istio-ecosystem#906)
  Annotate only our clusters when using kind (istio-ecosystem#904)
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 18, 2025
Automated merge
af2b2b8 
* upstream/main: (27 commits)
  Revert "Disable imageDigest support in ztunnel controller (openshift-service-mesh#582)" (istio-ecosystem#905)
  Fix typo in the ReportAfterSuite text (istio-ecosystem#911)
  Fix cleanup in multicluster tests (istio-ecosystem#909)
  Adding Eventually to Helm operator install (istio-ecosystem#907)
  Skip cleanup if control plane tests fail (istio-ecosystem#910)
  Use debug logging in integration tests (istio-ecosystem#906)
  Annotate only our clusters when using kind (istio-ecosystem#904)
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 18, 2025
Automated merge
bb554b9 
* upstream/main: (28 commits)
  Fix docs for "broken_links" workflow (istio-ecosystem#918)
  Revert "Disable imageDigest support in ztunnel controller (openshift-service-mesh#582)" (istio-ecosystem#905)
  Fix typo in the ReportAfterSuite text (istio-ecosystem#911)
  Fix cleanup in multicluster tests (istio-ecosystem#909)
  Adding Eventually to Helm operator install (istio-ecosystem#907)
  Skip cleanup if control plane tests fail (istio-ecosystem#910)
  Use debug logging in integration tests (istio-ecosystem#906)
  Annotate only our clusters when using kind (istio-ecosystem#904)
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 18, 2025
Automated merge
4b35ea2 
* upstream/main: (29 commits)
  e2e allow to build and push setting target arch (istio-ecosystem#913)
  Fix docs for "broken_links" workflow (istio-ecosystem#918)
  Revert "Disable imageDigest support in ztunnel controller (openshift-service-mesh#582)" (istio-ecosystem#905)
  Fix typo in the ReportAfterSuite text (istio-ecosystem#911)
  Fix cleanup in multicluster tests (istio-ecosystem#909)
  Adding Eventually to Helm operator install (istio-ecosystem#907)
  Skip cleanup if control plane tests fail (istio-ecosystem#910)
  Use debug logging in integration tests (istio-ecosystem#906)
  Annotate only our clusters when using kind (istio-ecosystem#904)
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 18, 2025
Automated merge
0750585 
* upstream/main: (34 commits)
  Update VERSIONS_YAML_FILE e2e test information (istio-ecosystem#916)
  Improve automated docs test run (istio-ecosystem#894)
  Use `Eventually` in remote secret generation (istio-ecosystem#921)
  Docs followup link fix (istio-ecosystem#919)
  Fix helm issue during e2e test run  operator installation (istio-ecosystem#914)
  e2e allow to build and push setting target arch (istio-ecosystem#913)
  Fix docs for "broken_links" workflow (istio-ecosystem#918)
  Revert "Disable imageDigest support in ztunnel controller (openshift-service-mesh#582)" (istio-ecosystem#905)
  Fix typo in the ReportAfterSuite text (istio-ecosystem#911)
  Fix cleanup in multicluster tests (istio-ecosystem#909)
  Adding Eventually to Helm operator install (istio-ecosystem#907)
  Skip cleanup if control plane tests fail (istio-ecosystem#910)
  Use debug logging in integration tests (istio-ecosystem#906)
  Annotate only our clusters when using kind (istio-ecosystem#904)
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  ...
fjglira pushed a commit to fjglira/sail-operator that referenced this pull request Jun 19, 2025
@mkolesnik @fjglira
Fix cleanup in multicluster tests (istio-ecosystem#909)
7aa7a35 
The cleanup effectively ignored the `KEEP_ON_FAILURE` flag since
`CurrentSpecReport()` at this level doesn't return any usable
information since all the tests have finished.

Instead, we use `ReportAfterSuite` which recieves a concentrated report
and can tell if the suite has passed or failed.

Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
fjglira pushed a commit to fjglira/sail-operator that referenced this pull request Jun 19, 2025
@mkolesnik @fjglira
Fix cleanup in multicluster tests (istio-ecosystem#909)
7671df4 
The cleanup effectively ignored the `KEEP_ON_FAILURE` flag since
`CurrentSpecReport()` at this level doesn't return any usable
information since all the tests have finished.

Instead, we use `ReportAfterSuite` which recieves a concentrated report
and can tell if the suite has passed or failed.

Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
@dgn
Copy link
Copy Markdown
Collaborator

dgn commented Jul 3, 2025

/cherry-pick release-1.26

@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented Jul 3, 2025

@dgn: #909 failed to apply on top of branch "release-1.26":

Applying: Fix cleanup in multicluster tests
Using index info to reconstruct a base tree...
M	tests/e2e/multicluster/multicluster_suite_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/multicluster/multicluster_suite_test.go
CONFLICT (content): Merge conflict in tests/e2e/multicluster/multicluster_suite_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 0001 Fix cleanup in multicluster tests
Details

In response to this:

/cherry-pick release-1.26

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.

@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented Jul 3, 2025

@dgn: new issue created for failed cherrypick: #980

Details

In response to this:

/cherry-pick release-1.26

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.

@istio-testing istio-testing mentioned this pull request Jul 3, 2025
Closed
dgn pushed a commit to dgn/sail-operator that referenced this pull request Mar 17, 2026
@mkolesnik @dgn
Fix cleanup in multicluster tests (istio-ecosystem#909)
942b2f1 
The cleanup effectively ignored the `KEEP_ON_FAILURE` flag since
`CurrentSpecReport()` at this level doesn't return any usable
information since all the tests have finished.

Instead, we use `ReportAfterSuite` which recieves a concentrated report
and can tell if the suite has passed or failed.

Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
Signed-off-by: Daniel Grimm <dgrimm@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sridhargaddam sridhargaddam sridhargaddam left review comments

@fjglira fjglira fjglira approved these changes

Assignees

No one assigned

Labels

size/XS

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mkolesnik @dgn @istio-testing @sridhargaddam @fjglira