Skip to content

oadp-operator: split e2e-test-kubevirt-aws into kdm/non-kdm jobs (oadp-1.6) - #84490

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
kaovilai:worktree-oadp-split-kubevirt-kdm-job
Sep 2, 2026
Merged

oadp-operator: split e2e-test-kubevirt-aws into kdm/non-kdm jobs (oadp-1.6)#84490
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
kaovilai:worktree-oadp-split-kubevirt-kdm-job

Conversation

@kaovilai

@kaovilai kaovilai commented Sep 2, 2026

Copy link
Copy Markdown
Member

Summary

Same fix as the earlier oadp-dev/5.0 split (#84337), now backported to oadp-1.6's own e2e-test-kubevirt-aws presubmit across all three variants (4.22, 4.23, 5.0). openshift/oadp-operator#2424 (cherry-pick of openshift/oadp-operator#2423 to oadp-1.6) gave this branch's Makefile the same TEST_VIRT_KDM support, so the split is safe here too:

  • virt-nokdm-e2e-test-aws: make TEST_VIRT=true TEST_VIRT_KDM=false test-e2e
  • virt-kdm-e2e-test-aws: make TEST_VIRT_KDM=true test-e2e

Prompted by openshift/oadp-operator#2427 ("unpend two kdm restore PIts"), which risks pushing the still-unsplit oadp-1.6 job back over the 2h step timeout the same way oadp-dev/5.0 originally hit it (openshift/oadp-operator#2413).

Note

Responses generated with Claude

Summary by CodeRabbit

The OADP operator CI configuration now splits AWS KubeVirt E2E presubmits into separate KDM and non-KDM jobs for the 4.22, 4.23, and 5.0 variants.

  • virt-nokdm-e2e-test-aws runs non-KDM tests with TEST_VIRT_KDM=false.
  • virt-kdm-e2e-test-aws runs KDM tests with TEST_VIRT_KDM=true.

This separation reduces the risk of exceeding the two-hour job timeout as additional KDM restore tests are enabled.

…p-1.6)

Same fix as the earlier oadp-dev/5.0 split (openshift#84337),
now backported to oadp-1.6's own e2e-test-kubevirt-aws presubmit across
all three variants (4.22, 4.23, 5.0). openshift/oadp-operator#2424
(cherry-pick of openshift#2423 to oadp-1.6) gave this branch's Makefile the same
TEST_VIRT_KDM support, so the split is safe here too.

- virt-nokdm-e2e-test-aws: TEST_VIRT=true TEST_VIRT_KDM=false
- virt-kdm-e2e-test-aws: TEST_VIRT_KDM=true

Prompted by openshift/oadp-operator#2427 (unpends two more kdm restore
specs on oadp-1.6), which risks pushing the still-unsplit job back over
the 2h step timeout the same way oadp-dev/5.0 hit it originally.

Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
@kaovilai

kaovilai commented Sep 2, 2026

Copy link
Copy Markdown
Member Author

/pj-rehearse pull-ci-openshift-oadp-operator-oadp-1.6-4.22-virt-kdm-e2e-test-aws pull-ci-openshift-oadp-operator-oadp-1.6-4.22-virt-nokdm-e2e-test-aws pull-ci-openshift-oadp-operator-oadp-1.6-4.23-virt-kdm-e2e-test-aws pull-ci-openshift-oadp-operator-oadp-1.6-4.23-virt-nokdm-e2e-test-aws pull-ci-openshift-oadp-operator-oadp-1.6-5.0-virt-kdm-e2e-test-aws pull-ci-openshift-oadp-operator-oadp-1.6-5.0-virt-nokdm-e2e-test-aws

Note

Responses generated with Claude

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@kaovilai
kaovilai marked this pull request as draft September 2, 2026 18:18
@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 Sep 2, 2026
@coderabbitai

coderabbitai Bot commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: cc81830b-eb86-4343-a698-cf9fb3e9289c

📥 Commits

Reviewing files that changed from the base of the PR and between df80573 and c22b436.

⛔ Files ignored due to path filters (1)
  • ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (3)
  • ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml
  • ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.23.yaml
  • ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yaml

Included review availability: Your plan provides up to 12 included reviews per hour; 11 remain after this review.


Walkthrough

The AWS KubeVirt E2E job is renamed and configured for KDM-disabled tests. A separate KDM-enabled E2E job is added to the OADP 1.6 configurations for OpenShift 4.22, 4.23, and 5.0.

Changes

AWS KubeVirt E2E configuration

Layer / File(s) Summary
KDM-disabled job configuration
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml, ...__4.23.yaml, ...__5.0.yaml
The existing AWS KubeVirt jobs are renamed to virt-nokdm-e2e-test-aws and run with TEST_VIRT=true TEST_VIRT_KDM=false.
KDM-enabled job configuration
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml, ...__4.23.yaml, ...__5.0.yaml
Each configuration adds a virt-kdm-e2e-test-aws job that runs with TEST_VIRT_KDM=true.

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk: ⚪ Minimal · up to c22b4

This PR separates the KubeVirt AWS presubmit into KDM and non-KDM jobs while preserving the required configuration for all three variants; no actionable merge-blocking risk remains beyond normal checks.

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0…
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed The pull request changes CI YAML and generated Prow job definitions only. The added names (virt-nokdm-e2e-test-aws and virt-kdm-e2e-test-aws) are static strings. The diff contains no Ginkgo declar…
Test Structure And Quality ✅ Passed PASS: The pull request changes only four YAML CI configuration files. The parent-to-HEAD diff contains no Ginkgo test code, It blocks, resource setup, waits, or assertions. Therefore, none of the five…
Microshift Test Compatibility ✅ Passed The check is not applicable. The commit changes only four YAML CI configuration files. The diff adds or modifies job definitions and make TEST_VIRT... test-e2e commands. It adds no Ginkgo test decla…
Single Node Openshift (Sno) Test Compatibility ✅ Passed The pull request adds no Ginkgo test source. The exact diff changes only three CI YAML configurations and one generated presubmit YAML, including job names and Make commands. No new It(), `Describe(…
Topology-Aware Scheduling Compatibility ✅ Passed PASS: The pull request changes only ci-operator test configuration and generated Prow presubmit definitions. It does not add or modify deployment manifests, operator code, or controllers. The diff i…
Ote Binary Stdout Contract ✅ Passed PASS — The pull request changes only YAML configuration and generated presubmit definitions. It adds or updates job names, targets, and make environment variables; it does not modify OTE binary sour…
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PASS. The pull request changes only CI YAML and generated Prow job registration. It adds no Ginkgo declarations or test source. The changed commands only split existing tests with TEST_VIRT and `TES…
No-Weak-Crypto ✅ Passed PASS. The PR changes CI YAML job names, commands, and generated presubmit metadata only. The added commands use TEST_VIRT and TEST_VIRT_KDM; the diff introduces no MD5, SHA-1, DES, 3DES, RC4, Blow…
Container-Privileges ✅ Passed PASS. The pull request changes only CI job names, targets, commands, labels, and generated job wiring. The exact diff for all four changed YAML files adds no privileged, hostPID, hostNetwork, `h…
No-Sensitive-Data-In-Logs ✅ Passed PASS: The PR adds no logging code or sensitive values. The committed diff only renames three CI jobs, adds TEST_VIRT/TEST_VIRT_KDM flags, and duplicates existing CI wiring. The new commands contai…
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely describes the main change: splitting the AWS KubeVirt E2E job into KDM and non-KDM jobs for oadp-1.6.
Full details: Docstring Coverage

Explanation

No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0 files. (3 skipped: 3 unsupported.)

Full details: Stable And Deterministic Test Names

Explanation

The pull request changes CI YAML and generated Prow job definitions only. The added names (virt-nokdm-e2e-test-aws and virt-kdm-e2e-test-aws) are static strings. The diff contains no Ginkgo declarations or dynamic test-title expressions such as It(), Describe(), Context(), When(), generated identifiers, timestamps, node names, namespaces, or IP addresses.

Full details: Test Structure And Quality

Explanation

PASS: The pull request changes only four YAML CI configuration files. The parent-to-HEAD diff contains no Ginkgo test code, It blocks, resource setup, waits, or assertions. Therefore, none of the five stated Ginkgo test-quality failure conditions apply.

Full details: Microshift Test Compatibility

Explanation

The check is not applicable. The commit changes only four YAML CI configuration files. The diff adds or modifies job definitions and make TEST_VIRT... test-e2e commands. It adds no Ginkgo test declarations or test source files, so it introduces no MicroShift-incompatible API or feature usage under this check.

Full details: Single Node Openshift (Sno) Test Compatibility

Explanation

The pull request adds no Ginkgo test source. The exact diff changes only three CI YAML configurations and one generated presubmit YAML, including job names and Make commands. No new It(), Describe(), Context(), or When() declarations were added, so the SNO compatibility check is not applicable.

Full details: Topology-Aware Scheduling Compatibility

Explanation

PASS: The pull request changes only ci-operator test configuration and generated Prow presubmit definitions. It does not add or modify deployment manifests, operator code, or controllers. The diff introduces test job names, commands, credentials, resources, and AWS cluster profiles, but no anti-affinity, topology spread constraints, node selectors or affinity, tolerations, replica counts, or PDBs. The topology-aware scheduling check is therefore not applicable.

Full details: Ote Binary Stdout Contract

Explanation

PASS — The pull request changes only YAML configuration and generated presubmit definitions. It adds or updates job names, targets, and make environment variables; it does not modify OTE binary source or add process-level stdout/logging code such as main, BeforeSuite, RunSpecs, fmt.Print*, or klog calls. The stdout contract is therefore not violated by this change.

Full details: Ipv6 And Disconnected Network Test Compatibility

Explanation

PASS. The pull request changes only CI YAML and generated Prow job registration. It adds no Ginkgo declarations or test source. The changed commands only split existing tests with TEST_VIRT and TEST_VIRT_KDM; they add no IPv4 literals, IP parsing, URLs, curl/wget calls, DNS names, or external service connections. Existing quay.io/konveyor image references are unchanged, and generated jobs use the internal quay-proxy.ci.openshift.org image.

Full details: No-Weak-Crypto

Explanation

PASS. The PR changes CI YAML job names, commands, and generated presubmit metadata only. The added commands use TEST_VIRT and TEST_VIRT_KDM; the diff introduces no MD5, SHA-1, DES, 3DES, RC4, Blowfish, ECB, custom crypto, or secret/token comparison logic. Credential references are CI mounts, not cryptographic operations.

Full details: Container-Privileges

Explanation

PASS. The pull request changes only CI job names, targets, commands, labels, and generated job wiring. The exact diff for all four changed YAML files adds no privileged, hostPID, hostNetwork, hostIPC, SYS_ADMIN, allowPrivilegeEscalation, or root/security-context setting. The generated Kubernetes job specs also contain no securityContext or runAsUser field. Therefore, the pull request does not introduce a condition listed by this check.

Full details: No-Sensitive-Data-In-Logs

Explanation

PASS: The PR adds no logging code or sensitive values. The committed diff only renames three CI jobs, adds TEST_VIRT/TEST_VIRT_KDM flags, and duplicates existing CI wiring. The new commands contain only boolean test flags. The credential mount references the existing oadp-credentials secret and does not print its contents. The reporter template and oadp-analyze-e2e-failure post-step are unchanged, and the added lines contain no password, token, API key, PII, hostname, session ID, or customer-data logging pattern.

✨ Finishing Touches 💡 1
🛠️ Fix failing CI checks 💡
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 2, 2026
@kaovilai
kaovilai marked this pull request as ready for review September 2, 2026 18:20
@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 Sep 2, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@kaovilai: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-oadp-operator-oadp-1.6-4.22-virt-kdm-e2e-test-aws openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.22-virt-nokdm-e2e-test-aws openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.23-virt-kdm-e2e-test-aws openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.23-virt-nokdm-e2e-test-aws openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.6-5.0-virt-kdm-e2e-test-aws openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.6-5.0-virt-nokdm-e2e-test-aws openshift/oadp-operator presubmit Presubmit changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci
openshift-ci Bot requested review from Joeavaikath and mpryc September 2, 2026 18:21

@shubham-pampattiwar shubham-pampattiwar left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/lgtm /approved

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 2, 2026

@weshayutin weshayutin 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

@kaovilai

kaovilai commented Sep 2, 2026

Copy link
Copy Markdown
Member Author

/pj-rehearse pull-ci-openshift-oadp-operator-oadp-1.6-5.0-virt-kdm-e2e-test-aws

(retrying -- prior attempt hit a transient network error during go mod download: "stream error ... INTERNAL_ERROR" pulling github.com/petar/GoLLRB from proxy.golang.org, unrelated to this PR's changes)

Note

Responses generated with Claude

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci

openshift-ci Bot commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, shubham-pampattiwar, sseago, weshayutin

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

@kaovilai

kaovilai commented Sep 2, 2026

Copy link
Copy Markdown
Member Author

/pj-rehearse ack

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Sep 2, 2026
@kaovilai

kaovilai commented Sep 2, 2026

Copy link
Copy Markdown
Member Author

/pj-rehearse pull-ci-openshift-oadp-operator-oadp-1.6-5.0-virt-nokdm-e2e-test-aws

(retrying -- per the job's own oadp-analyze-e2e-failure report: infra timing flake, EnsureCommunityHcoCatalog()'s 2-minute CatalogSource-channel wait timed out on a slow quay.io image pull in [BeforeAll], unrelated to this PR's changes)

Note

Responses generated with Claude

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot
openshift-merge-bot Bot merged commit bb0e1e9 into openshift:main Sep 2, 2026
17 of 22 checks passed
openshift-merge-bot Bot pushed a commit that referenced this pull request Sep 4, 2026
…jobs (#84592)

Same split already applied to the presubmits (#84337,
#84490), now extended to the daily periodics we'd deliberately left
unsplit at the time. All branches now have TEST_VIRT_KDM support
(openshift/oadp-operator#2423, #2424), so the periodics are safe to
split too:

- virt-nokdm-e2e-test-aws-periodic: TEST_VIRT=true TEST_VIRT_KDM=false
- virt-kdm-e2e-test-aws-periodic: TEST_VIRT_KDM=true

Applied to all 5 variant configs that carry this periodic:
oadp-dev (5.0, 5.1) and oadp-1.6 (4.22, 4.23, 5.0). Both split jobs
keep the same cron schedule and Slack reporter_config as the job they
replace.

Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
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. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants