Skip to content

Use pre-built CAPIO e2e image#78127

Draft
mdbooth wants to merge 2 commits into
openshift:mainfrom
openshift-cloud-team:capio-e2e-image
Draft

Use pre-built CAPIO e2e image#78127
mdbooth wants to merge 2 commits into
openshift:mainfrom
openshift-cloud-team:capio-e2e-image

Conversation

@mdbooth
Copy link
Copy Markdown
Contributor

@mdbooth mdbooth commented Apr 21, 2026

Summary by CodeRabbit

  • Chores
    • CI e2e test steps for multiple cloud providers updated to run a unified test script from a standardized test image.
    • Added a new CI image build for the e2e test artifacts to be used by those steps.
    • Per-step resource, timeout, and workflow settings remain unchanged.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 21, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mdbooth
Once this PR has been reviewed and has the lgtm label, please assign joelspeed for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Apr 21, 2026

Walkthrough

CI job configs updated to run E2E tests via /test.sh from a centralized stable:cluster-capi-operator-e2e-tests image instead of running openshift/e2e-tests.sh from src; a new E2E test image build was added to the cluster-capi-operator job.

Changes

Cohort / File(s) Summary
Provider E2E Test Configuration
ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-main.yaml, ci-operator/config/openshift/cluster-api-provider-nutanix/openshift-cluster-api-provider-nutanix-main.yaml, ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml, ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-master.yaml
Replaced test command openshift/e2e-tests.sh (from src) with /test.sh and switched artifact/container source from src to stable:cluster-capi-operator-e2e-tests for provider TechPreview E2E steps.
Cluster API E2E Test Configuration
ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml
Updated TechPreviewNoUpgrade E2E steps (AWS, GCP, Azure, vSphere, OpenStack) to execute /test.sh from stable:cluster-capi-operator-e2e-tests instead of openshift/e2e-tests.sh from src.
Cluster CAPI Operator Configuration
ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml
Added inline E2E test image build (cluster-capi-operator-e2e-tests) with a multi-stage Dockerfile; updated job steps to run /test.sh from that image instead of make e2e from src.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes


Important

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Ote Binary Stdout Contract ❓ Inconclusive The actual test script (hack/test.sh) referenced in the Dockerfile is from the cluster-capi-operator repository and not present in this release repository PR, preventing verification of whether it outputs only JSON to stdout. Examine the hack/test.sh script in the cluster-capi-operator repository to verify it outputs only JSON to stdout when executed as the test entrypoint, and address the existing DNM comment.
✅ Passed checks (11 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title 'Use pre-built CAPIO e2e image' clearly and concisely summarizes the main change across all modified files: replacing inline e2e test execution with a pre-built container image for CAPIO (Cluster API Provider IO) end-to-end tests.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
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 PR modifies only CI operator configuration YAML files with no Ginkgo test definitions in Go test files.
Test Structure And Quality ✅ Passed PR modifies only CI configuration YAML files and Dockerfile packaging pre-built test binaries, not Ginkgo test source code.
Microshift Test Compatibility ✅ Passed This PR modifies CI configuration files only and does not add new Ginkgo e2e test code definitions to the repository.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This pull request does not introduce any new Ginkgo e2e tests, only modifies CI configuration files to change how existing tests are packaged and executed.
Topology-Aware Scheduling Compatibility ✅ Passed PR contains only CI operator configuration changes (test step definitions and container image build recipes), not deployment manifests or operator code with scheduling constraints.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Pull request modifies only CI/CD configuration files to adjust e2e test invocation and container images; no new Ginkgo test code introduced.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci openshift-ci Bot requested review from damdo and gryf April 21, 2026 16:23
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

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

🧹 Nitpick comments (1)
ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml (1)

64-65: Consider a shared step/chain to reduce config drift.

These test stanzas are nearly identical; extracting to a reusable registry ref/chain would simplify maintenance across providers.

Also applies to: 79-80, 93-94, 107-108, 121-122

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml`
around lines 64 - 65, Multiple nearly identical pipeline steps use the same
commands and image (commands: /test.sh and from:
stable:cluster-capi-operator-e2e-tests); extract these into a single reusable
step/chain (e.g., create a registry entry like ref: ci/shared/steps/capi-e2e or
a chain named capi-e2e-tests) and replace each duplicated stanza with a
reference to that shared ref/chain; ensure the new shared step preserves the
environment, timeout and any labels/metadata and update all occurrences that
currently use "commands: /test.sh" and "from:
stable:cluster-capi-operator-e2e-tests" to reference the shared definition.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Nitpick comments:
In `@ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml`:
- Around line 64-65: Multiple nearly identical pipeline steps use the same
commands and image (commands: /test.sh and from:
stable:cluster-capi-operator-e2e-tests); extract these into a single reusable
step/chain (e.g., create a registry entry like ref: ci/shared/steps/capi-e2e or
a chain named capi-e2e-tests) and replace each duplicated stanza with a
reference to that shared ref/chain; ensure the new shared step preserves the
environment, timeout and any labels/metadata and update all occurrences that
currently use "commands: /test.sh" and "from:
stable:cluster-capi-operator-e2e-tests" to reference the shared definition.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: f171b8ba-fbcb-4087-901e-feb93d11070b

📥 Commits

Reviewing files that changed from the base of the PR and between 1d97ea6 and a5d6cd8.

📒 Files selected for processing (6)
  • ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-main.yaml
  • ci-operator/config/openshift/cluster-api-provider-nutanix/openshift-cluster-api-provider-nutanix-main.yaml
  • ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml
  • ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-master.yaml
  • ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml
  • ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml

@mdbooth mdbooth marked this pull request as draft April 21, 2026 16:42
@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 Apr 21, 2026
@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented Apr 21, 2026

/pj-rehearse

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In
`@ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml`:
- Around line 19-21: The PR currently contains a “For testing only, DNM” comment
and commented-out dockerfile lines (the commented block containing
"dockerfile_path: Dockerfile.e2e" and "to: cluster-capi-operator-e2e-tests");
remove the DNM text and either delete the commented-out Dockerfile.e2e lines if
they are obsolete or replace them with the intended configuration (or add a
clarifying inline note that this dockerfile_literal replaces the external
Dockerfile) so the manifest in openshift-cluster-capi-operator-main.yaml
accurately reflects the final desired state for merge.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 6186633a-ce35-419b-9f0f-cd4c6e578b77

📥 Commits

Reviewing files that changed from the base of the PR and between a5d6cd8 and 9a2b9c3.

📒 Files selected for processing (1)
  • ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml

Comment on lines +19 to +21
# - dockerfile_path: Dockerfile.e2e
# to: cluster-capi-operator-e2e-tests
# For testing only, DNM
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.

⚠️ Potential issue | 🔴 Critical

The "DNM" (Do Not Merge) comment indicates this PR is not ready for merge.

Line 21 explicitly states "For testing only, DNM" which contradicts the PR being submitted for review. Before merging:

  1. Remove the commented-out Dockerfile.e2e lines if they're no longer needed
  2. Remove the "For testing only, DNM" comment
  3. Or clarify if this inline dockerfile_literal is intentionally replacing the external Dockerfile approach
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In
`@ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml`
around lines 19 - 21, The PR currently contains a “For testing only, DNM”
comment and commented-out dockerfile lines (the commented block containing
"dockerfile_path: Dockerfile.e2e" and "to: cluster-capi-operator-e2e-tests");
remove the DNM text and either delete the commented-out Dockerfile.e2e lines if
they are obsolete or replace them with the intended configuration (or add a
clarifying inline note that this dockerfile_literal replaces the external
Dockerfile) so the manifest in openshift-cluster-capi-operator-main.yaml
accurately reflects the final desired state for merge.

@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented May 29, 2026

/pj-rehearse

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 29, 2026
@mdbooth mdbooth force-pushed the capio-e2e-image branch from 9a2b9c3 to 4321923 Compare May 29, 2026 08:33
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 29, 2026
@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented May 29, 2026

/pj-rehearse

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

@mdbooth mdbooth force-pushed the capio-e2e-image branch from 4321923 to bd8b130 Compare May 29, 2026 15:19
@mdbooth
Copy link
Copy Markdown
Contributor Author

mdbooth commented May 29, 2026

/pj-rehearse pull-ci-openshift-cluster-capi-operator-main-e2e-aws-capi-techpreview pull-ci-openshift-cluster-api-main-e2e-aws-capi-techpreview

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@mdbooth: 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-cluster-api-provider-vsphere-main-e2e-vsphere-capi-techpreview openshift/cluster-api-provider-vsphere presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-build openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-aws-capi-disconnected-techpreview openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-aws-capi-techpreview openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-aws-capi-techpreview-post-install openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-aws-ovn openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-aws-ovn-serial-1of2 openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-aws-ovn-serial-2of2 openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-aws-ovn-techpreview openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-aws-ovn-techpreview-upgrade openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-azure-capi-techpreview openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-azure-ovn-techpreview openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-azure-ovn-techpreview-upgrade openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-gcp-capi-techpreview openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-gcp-ovn-techpreview openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-metal3-capi-techpreview openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-openstack-capi-techpreview openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-openstack-ovn-techpreview openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-e2e-vsphere-capi-techpreview openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-images openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-lint openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-okd-scos-e2e-aws-ovn openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-okd-scos-images openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-regression-clusterinfra-aws-ipi-techpreview-capi openshift/cluster-capi-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-capi-operator-main-unit openshift/cluster-capi-operator presubmit Ci-operator config changed

A total of 35 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here

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
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 29, 2026

@mdbooth: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/rehearse/openshift/cluster-api/master/e2e-azure-capi-techpreview 9a2b9c3 link unknown /pj-rehearse pull-ci-openshift-cluster-api-master-e2e-azure-capi-techpreview
ci/rehearse/openshift/cluster-api/master/e2e-aws-capi-techpreview 9a2b9c3 link unknown /pj-rehearse pull-ci-openshift-cluster-api-master-e2e-aws-capi-techpreview
ci/rehearse/openshift/cluster-api-provider-nutanix/main/e2e-nutanix-capi-techpreview 9a2b9c3 link unknown /pj-rehearse pull-ci-openshift-cluster-api-provider-nutanix-main-e2e-nutanix-capi-techpreview
ci/rehearse/openshift/cluster-api-provider-vsphere/master/e2e-vsphere-capi-techpreview 9a2b9c3 link unknown /pj-rehearse pull-ci-openshift-cluster-api-provider-vsphere-master-e2e-vsphere-capi-techpreview
ci/rehearse/openshift/cluster-api/main/e2e-aws-capi-techpreview bd8b130 link unknown /pj-rehearse pull-ci-openshift-cluster-api-main-e2e-aws-capi-techpreview
ci/rehearse/openshift/cluster-api-provider-azure/main/e2e-azure-capi-techpreview 4321923 link unknown /pj-rehearse pull-ci-openshift-cluster-api-provider-azure-main-e2e-azure-capi-techpreview
ci/rehearse/openshift/cluster-capi-operator/main/e2e-aws-capi-techpreview bd8b130 link unknown /pj-rehearse pull-ci-openshift-cluster-capi-operator-main-e2e-aws-capi-techpreview

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.

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

Labels

do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant