Skip to content

[release-4.22] USHIFT-6959 USHIFT-6960 USHIFT-6971 USHIFT-6979 USHIFT-6993 USHIFT-7034: Reorganize optional RF tests#6705

Merged
openshift-merge-bot[bot] merged 3 commits into
openshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-6667-to-release-4.22
May 20, 2026
Merged

[release-4.22] USHIFT-6959 USHIFT-6960 USHIFT-6971 USHIFT-6979 USHIFT-6993 USHIFT-7034: Reorganize optional RF tests#6705
openshift-merge-bot[bot] merged 3 commits into
openshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-6667-to-release-4.22

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown

This is an automated cherry-pick of #6667

/assign pacevedom

pacevedom added 3 commits May 20, 2026 11:41
Add optional-config.resource with keywords to reconfigure MicroShift's
kustomizePaths so each test suite loads only its required manifests.d
directories. This avoids running all optional controllers simultaneously,
reducing API server contention from concurrent controller wake-ups.
Each optional test suite now reconfigures MicroShift at setup to load
only its own manifests.d directory, cleans etcd data, and restarts
fresh. Suites that don't need optional components run with base
manifests only. Bump TEST_EXECUTION_TIMEOUT to 60m to account for
the per-suite restart overhead.

Suite-to-manifests.d mapping:
- olm.robot: 001-microshift-olm
- cert-manager.robot: 060-microshift-cert-manager
- gateway-api.robot: 000-microshift-gateway-api
- sriov.robot: 070-microshift-sriov
- observability.robot: 003-microshift-observability
- multus, healthchecks, tls-scanner, GDP: base only
The healthcheck previously determined which optional workloads to wait
for by checking whether manifests.d directories exist on the filesystem.
This ignored the kustomizePaths configuration, causing the healthcheck
to wait for components that were not configured to be deployed.

Now the healthcheck also verifies that each optional component path is
included in the resolved kustomizePaths before adding it to the wait
list. This allows selective loading of optional components via config
without the healthcheck timing out on unconfigured ones.
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented May 20, 2026

@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: USHIFT-6959, USHIFT-6960, USHIFT-6971, USHIFT-6979, USHIFT-6993, USHIFT-7034

Details

In response to this:

This is an automated cherry-pick of #6667

/assign pacevedom

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.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 20, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 21b95d90-d823-47c2-b533-49605a2c5cfe

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@pacevedom pacevedom changed the title [release-4.22] USHIFT-6959 USHIFT-6960 USHIFT-6979 USHIFT-6993 USHIFT-7034: Reorganize optional RF tests [release-4.22] USHIFT-6959 USHIFT-6960 USHIFT-6971 USHIFT-6979 USHIFT-6993 USHIFT-7034: Reorganize optional RF tests May 20, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 20, 2026
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented May 20, 2026

@openshift-cherrypick-robot: This pull request references USHIFT-6959 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.22.0" version, but no target version was set.

This pull request references USHIFT-6960 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.22.0" version, but no target version was set.

This pull request references USHIFT-6971 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.22.0" version, but no target version was set.

This pull request references USHIFT-6979 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.22.0" version, but no target version was set.

This pull request references USHIFT-6993 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.22.0" version, but no target version was set.

This pull request references USHIFT-7034 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.22.0" version, but no target version was set.

Details

In response to this:

This is an automated cherry-pick of #6667

/assign pacevedom

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.

@openshift-ci openshift-ci Bot requested review from pacevedom and vanhalenar May 20, 2026 11:42
@pacevedom
Copy link
Copy Markdown
Contributor

/retest

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 20, 2026

@openshift-cherrypick-robot: 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.

@pacevedom
Copy link
Copy Markdown
Contributor

/verified by CI

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label May 20, 2026
Copy link
Copy Markdown
Contributor

@pacevedom pacevedom 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-robot
Copy link
Copy Markdown

@pacevedom: This PR has been marked as verified by CI.

Details

In response to this:

/verified by CI

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.

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

openshift-ci Bot commented May 20, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, pacevedom

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-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 20, 2026
@pacevedom
Copy link
Copy Markdown
Contributor

/label jira/valid-bug
/label backport-risk-assessed

@openshift-ci openshift-ci Bot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. labels May 20, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 9c4d1c0 into openshift:release-4.22 May 20, 2026
17 checks passed
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. 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants