Skip to content

Add disconnected validation step to ocp-virt-validation-checkup CI jobs#79293

Open
rlobillo wants to merge 1 commit into
openshift:mainfrom
rlobillo:self-validation-disconnected
Open

Add disconnected validation step to ocp-virt-validation-checkup CI jobs#79293
rlobillo wants to merge 1 commit into
openshift:mainfrom
rlobillo:self-validation-disconnected

Conversation

@rlobillo
Copy link
Copy Markdown
Contributor

@rlobillo rlobillo commented May 14, 2026

Summary

  • Add run-validation-checkup-disconnected inline test step to the presubmit (e2e-aws) and periodic (e2e-azure) CI jobs for ocp-virt-validation-checkup
  • The disconnected step runs after the connected validation on the same cluster — no new jobs or clusters are provisioned
  • Injects a podmanskopeo shell wrapper since CI pods lack podman

Changes

File Change
ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main.yaml Add run-validation-checkup-disconnected step to e2e-aws presubmit
ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main__periodics.yaml Add run-validation-checkup-disconnected step to e2e-azure periodic

What this PR does / why we need it

The make ci-validate-disconnected target runs the validation checkup in a simulated disconnected environment (mirrors images to internal registry, applies ITMS+IDMS with NeverContactSource). This already works locally but had no CI coverage.

Presubmit (e2e-aws): Uses dependencies block for locally-built image, 1 env var (STORAGE_CLASS), 3h timeout.

Periodic (e2e-azure): Uses CSV-based dynamic image resolution (no dependencies), 6 env vars, 3h timeout.

Both steps include a podmanskopeo wrapper for CI compatibility.

Test plan

  • make update succeeds without errors
  • Generated jobs include the new step in both presubmit and periodic
  • After merge, trigger with /test e2e-aws to verify end-to-end
  • Confirm the podman wrapper delegates to skopeo for login calls
  • Confirm disconnected validation runs after connected validation on the same cluster

🔨 Generated by The Automation Forge

Summary

This PR updates the OpenShift CNV ocp-virt-validation-checkup OpenShift CI configs to add a disconnected-environment validation step that runs after the existing connected validation on the same cluster (no new cluster provisioning).

Changes

  • Adds a new test step run-validation-checkup-disconnected to:

    • Presubmit (e2e-aws) job: ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main.yaml
      • Runs from a new image variant from: src-disconnected
      • Uses the existing ocp-virt-validation-checkup dependency (dependencies block present)
      • Exposes 1 env var (STORAGE_CLASS, default gp3)
      • Timeout: 3h0m0s
    • Periodic (e2e-azure) job: ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main__periodics.yaml
      • Runs from src-disconnected (CSV-based dynamic image resolution; no dependencies block)
      • Mirrors the connected step’s env vars (DRY_RUN, OCP_VIRT_VALIDATION_TIMEOUT, STORAGE_CLASS, TEST_SKIPS, TARGET_NAMESPACE, ARTIFACTS_DIR)
      • Timeout: 3h0m0s
  • Adds image build variant src-disconnected that starts FROM src and installs skopeo (so skopeo is available inside the test container).

Technical details

  • The new step runs make ci-validate-disconnected which:
    • Mirrors images to an internal registry and applies ImageTagMirrorSet + ImageDigestMirrorSet with NeverContactSource to simulate a disconnected environment.
    • Runs on the same cluster used by the connected validation step (no provisioning of extra clusters).
  • Because CI pods lack podman, each job injects a small shell wrapper: if podman is missing and skopeo is present, create /tmp/podman that execs skopeo and prepend /tmp to PATH so existing podman invocations delegate to skopeo.
  • CPU/memory requests for the new step match existing validation steps.

Files touched

  • ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main.yaml
  • ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main__periodics.yaml

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 14, 2026
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 14, 2026

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: c42abe36-b840-434e-8635-906ac0c6291b

📥 Commits

Reviewing files that changed from the base of the PR and between 0f04172 and b991376.

⛔ Files ignored due to path filters (1)
  • ci-operator/jobs/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main-presubmits.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (2)
  • ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main.yaml
  • ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main__periodics.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
  • ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main__periodics.yaml

Walkthrough

Adds a disconnected validation CI path: a new src-disconnected image (installs skopeo) and a run-validation-checkup-disconnected test step (e2e-aws and periodics) that runs make ci-validate-disconnected, includes a podman→skopeo wrapper fallback, and sets a 3h timeout and resource requests.

Changes

Disconnected Validation Checkup

Layer / File(s) Summary
Image variant: src-disconnected
ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main.yaml, ...-main__periodics.yaml
Adds src-disconnected build variant derived FROM src and installs skopeo (via dnf) to provide skopeo in the CI image.
E2E job test step
ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main.yaml
Introduces run-validation-checkup-disconnected under tests[as=e2e-aws]: runs make ci-validate-disconnected (cli: latest), runs from src-disconnected, sets STORAGE_CLASS (default gp3) and other env vars, mirrors existing CPU/memory requests, contains conditional wrapper that uses skopeo when podman is missing, and sets timeout: 3h0m0s.
Periodic job test step
ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main__periodics.yaml
Adds periodic run-validation-checkup-disconnected step: same command flow and env vars (DRY_RUN, OCP_VIRT_VALIDATION_TIMEOUT, STORAGE_CLASS, TEST_SKIPS, TARGET_NAMESPACE, ARTIFACTS_DIR), uses from: src-disconnected, includes podman→skopeo wrapper, resolves CSV_NAME/OCP_VIRT_VALIDATION_IMAGE at runtime, and sets timeout: 3h0m0s.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely summarizes the main change: adding a disconnected validation step to CI jobs for ocp-virt-validation-checkup.
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 Check not applicable. PR modifies only CI operator YAML configuration files, not application test code or Ginkgo test definitions.
Test Structure And Quality ✅ Passed Custom check targets Ginkgo test code. PR modifies only CI operator YAML configuration files for OpenShift CI jobs. No Ginkgo test code present in PR changes, so check is not applicable.
Microshift Test Compatibility ✅ Passed PR adds only OpenShift CI operator YAML configuration, no Ginkgo e2e tests. The check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR modifies only CI-operator YAML configuration files, not Ginkgo e2e test code. Custom check addresses Ginkgo test SNO compatibility, not applicable here.
Topology-Aware Scheduling Compatibility ✅ Passed Changes are to CI operator config files only. Check applies to deployment manifests, operator code, and controllers—none modified. No scheduling constraints introduced.
Ote Binary Stdout Contract ✅ Passed This PR modifies only YAML CI configuration files, not Go test code. The OTE Stdout Contract check applies only to Go binaries' process-level code. Not applicable to this PR.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR contains only CI operator YAML configuration changes with no new Ginkgo e2e test code. The custom check applies only to new e2e tests, so it is not applicable.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

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

Tip

💬 Introducing Slack Agent: The best way for teams to turn conversations into code.

Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.

  • Generate code and open pull requests
  • Plan features and break down work
  • Investigate incidents and troubleshoot customer tickets together
  • Automate recurring tasks and respond to alerts with triggers
  • Summarize progress and report instantly

Built for teams:

  • Shared memory across your entire org—no repeating context
  • Per-thread sandboxes to safely plan and execute work
  • Governance built-in—scoped access, auditability, and budget controls

One agent for your entire SDLC. Right inside Slack.

👉 Get started


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@openshift-ci openshift-ci Bot requested review from nunnatsa and orenc1 May 14, 2026 09:48
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-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main__periodics.yaml (1)

102-105: ⚡ Quick win

Scope the podman shim to supported verbs only.

While the disconnected target likely uses only podman login, the current shim forwards all subcommands to skopeo. Skopeo supports only a limited set of verbs (login, copy, inspect); if the target later calls podman pull, podman push, or other unsupported commands, the shim will silently fail instead of erroring. Restrict the wrapper to explicitly handle login and reject unknown verbs with a clear error message.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main__periodics.yaml`
around lines 102 - 105, The inline shell shim podman() currently forwards all
verbs to skopeo; replace it with a scoped wrapper that only allows the supported
verb(s): check the first argument inside the podman() function (e.g., "$1") and
if it equals "login" call skopeo login with the same arguments, otherwise print
a clear error message to stderr and exit with a non-zero status; keep the
existing command -v checks and export -f podman so the function is available.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Nitpick comments:
In
`@ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main__periodics.yaml`:
- Around line 102-105: The inline shell shim podman() currently forwards all
verbs to skopeo; replace it with a scoped wrapper that only allows the supported
verb(s): check the first argument inside the podman() function (e.g., "$1") and
if it equals "login" call skopeo login with the same arguments, otherwise print
a clear error message to stderr and exit with a non-zero status; keep the
existing command -v checks and export -f podman so the function is available.

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 62968f6b-3ea1-4b61-9209-9142fe4f1a32

📥 Commits

Reviewing files that changed from the base of the PR and between 849b963 and 0f04172.

📒 Files selected for processing (2)
  • ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main.yaml
  • ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main__periodics.yaml

@rlobillo
Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

…heckup CI jobs

Add src-disconnected image (src + skopeo) and podman wrapper script
for disconnected validation in CI environments without podman.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@rlobillo rlobillo force-pushed the self-validation-disconnected branch from 0f04172 to b991376 Compare May 14, 2026 12:51
@rlobillo
Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-cnv-ocp-virt-validation-checkup-main-e2e-aws

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 14, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rlobillo

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

[REHEARSALNOTIFIER]
@rlobillo: 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-cnv-ocp-virt-validation-checkup-main-periodics-images openshift-cnv/ocp-virt-validation-checkup presubmit Presubmit changed
pull-ci-openshift-cnv-ocp-virt-validation-checkup-main-e2e-aws openshift-cnv/ocp-virt-validation-checkup presubmit Ci-operator config changed
pull-ci-openshift-cnv-ocp-virt-validation-checkup-main-images openshift-cnv/ocp-virt-validation-checkup presubmit Ci-operator config changed
pull-ci-openshift-cnv-ocp-virt-validation-checkup-main-unit openshift-cnv/ocp-virt-validation-checkup presubmit Ci-operator config changed
periodic-ci-openshift-cnv-ocp-virt-validation-checkup-main-periodics-e2e-azure N/A periodic Ci-operator config changed
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 14, 2026

@rlobillo: The following test 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-cnv/ocp-virt-validation-checkup/main/e2e-aws b991376 link unknown /pj-rehearse pull-ci-openshift-cnv-ocp-virt-validation-checkup-main-e2e-aws

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

approved Indicates a PR has been approved by an approver from all required OWNERS files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant