Skip to content

osp_verification: purge bogus Machines and harden LB suite cleanup - #42

Merged
openshift-merge-bot[bot] merged 1 commit into
mainfrom
fix/osp-verification-bogus-lb-hygiene
Sep 24, 2026
Merged

openshift-merge-bot[bot] merged 1 commit into
mainfrom
fix/osp-verification-bogus-lb-hygiene

Conversation

@tusharjadhav3302

@tusharjadhav3302 tusharjadhav3302 commented Sep 23, 2026 •

Copy link
Copy Markdown
Contributor

Summary

  • Before openstack_test, best-effort purge leftover bogus-* MachineSets/Machines so Machine Its are not poisoned by incomplete bz_2073398 cleanup (pairs with openstack-test fix; this is suite-level hygiene).
  • For osp_verification nightlies: enable lb_tests guest cleanup after Amphora/OVN phases and remove orphan lb-sg-* attachments so ProviderSpec is not tripped by LB leftovers when lb_tests runs first.
  • Serial OTE: do not mark the stage failed/UNSTABLE on skip-only run-test exit codes; fix late Amphora sourceRanges junit rewrite that emitted tests=0 on pass.

Test plan

  • Warm guest: lb_tests then openstack_test
  • No bogus-* in openshift-machine-api after openstack_test starts
  • ProviderSpec not failing on leftover lb-sg-*
  • Late sourceRanges junit non-empty on pass; OVN skip-only does not UNSTABLE

Made with Cursor

Comment thread collection/stages/roles/openstack_test/tasks/run_openstack_test.yml Outdated
@tusharjadhav3302
tusharjadhav3302 force-pushed the fix/osp-verification-bogus-lb-hygiene branch from ffb5ab7 to cedfc1b Compare September 23, 2026 12:28
Comment thread collection/stages/roles/openstack_test/tasks/run_openstack_test.yml
@tusharjadhav3302
tusharjadhav3302 force-pushed the fix/osp-verification-bogus-lb-hygiene branch 2 times, most recently from 270a5a7 to 4cbb915 Compare September 23, 2026 16:31
@tusharjadhav3302

tusharjadhav3302 commented Sep 23, 2026 •

Copy link
Copy Markdown
Contributor Author

Follow-up from serval71 combo validation with openstack-test #321:

Serial OTE was still marking stages UNSTABLE (rescued) when junit showed passed>0 and failed=0. Root cause: mid-loop treated run-test non-zero + empty per-chunk resolve as suite failure, even though the aggregated log resolved correctly (OTE often exits non-zero before a standalone chunk parses).

Empty per-chunk resolve now falls back to ginkgo SUCCESS!/FAIL!/SKIP signals, and otherwise defers to the end-of-suite resolvable==expected check. Failed/unknown still fail immediately.


- name: Short wait after bogus Machine purge
ansible.builtin.pause:
seconds: 15

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.

Could we replace this fixed 15-second pause with a condition-based wait? The preceding deletions use --wait=false, so this task can continue while the Machines/MachineSets are still terminating or blocked by finalizers. openstack_test may then start with the leftover bogus-* resources still present, causing the exact contamination this cleanup is intended to prevent. Please poll until the matching resources are absent, with a bounded timeout.

@tusharjadhav3302 tusharjadhav3302 Sep 24, 2026 •

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Agreed. Replaced the fixed 15s pause with a poll until no bogus-* Machines/MachineSets remain (30 retries x 10s, best-effort so a finalizer-stuck object does not hard-fail the stage). Amended tip.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Follow-up: removed failed_when: false on the wait. If bogus-* Machines/MachineSets are still present after the bounded poll, the cleanup task fails and openstack_test does not start. Amended tip.

@tusharjadhav3302
tusharjadhav3302 force-pushed the fix/osp-verification-bogus-lb-hygiene branch from 4cbb915 to aeb6f67 Compare September 24, 2026 09:50
Purge bogus-* leftovers before openstack_test, enable nightly LB guest
cleanup including lb-sg-*, and fix serial OTE skip exits plus empty
late sourceRanges junit.

Serial OTE: ignore run-test non-zero only when resolver or ginkgo
confirms skip/pass; empty per-chunk parse defers to end-of-suite
resolvable count so pass/skip-heavy phases do not false-UNSTABLE.

Bogus purge: poll until Machines/MachineSets are gone (bounded
timeout) and fail if leftovers remain so openstack_test cannot
start with contamination.

Co-authored-by: Cursor <cursoragent@cursor.com>
@tusharjadhav3302
tusharjadhav3302 force-pushed the fix/osp-verification-bogus-lb-hygiene branch from aeb6f67 to 57e1c8c Compare September 24, 2026 11:51

@ekuris-redhat ekuris-redhat left a comment

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.

/lgtm

@openshift-ci

openshift-ci Bot commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ekuris-redhat

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

@openshift-merge-bot
openshift-merge-bot Bot merged commit f01bb8a into main Sep 24, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

2 participants