Skip to content

OSAC-2275: Migrate E2E tests to OCP 4.22 - #199

Merged
openshift-merge-bot[bot] merged 4 commits into
osac-project:mainfrom
amej:feat/OSAC-2275
Jul 20, 2026
Merged

openshift-merge-bot[bot] merged 4 commits into
osac-project:mainfrom
amej:feat/OSAC-2275

Conversation

@amej

@amej amej commented Jul 14, 2026 •

Copy link
Copy Markdown
Contributor

OSAC-2275: Migrate E2E tests to OCP 4.22

Jira: https://redhat.atlassian.net/browse/OSAC-2275
Story type: Task

Summary

Bumps both OCP version pins used by the CaaS/BMaaS E2E flow in the netris backend to 4.22: the CaaS target-cluster pin (caas_ocp_version) and the hub/management-cluster pin (ocp_version). This lets the BMaaS flow use the new Metal3 BareMetalHost container-registry image reference feature shipped in OCP 4.22.

Changes

  • infra/netris/inventory/group_vars/all.yml:
    • caas_ocp_version: "4.19" → "4.22" — the CaaS target cluster. caas_release_image and post-osac.yml's OS-image filter already template off this variable.
    • ocp_version: "4.21" → "4.22" — the hub/management SNO cluster, installed via aicli/on-prem assisted-service. roles/ocp_install's openshift_version and roles/assisted_service's OS-image filter already template off this variable.
  • infra/netris/README.md: Updated documentation tables and examples to reflect the new 4.22 defaults.

Testing

  • Unit tests: N/A — no unit-testable code changed (Ansible variable values and docs only).
  • Integration tests: No new tests added. The existing tests/caas/test_cluster_create.py suite (unchanged) exercises the full CaaS lifecycle (create → verify ready via gRPC → delete → verify cleanup) and now runs against a hub and target both on OCP 4.22.
  • Coverage: pre-commit run --all-files (yamllint --strict + ansible-lint) passes. No remaining references to the old 4.19 or 4.21 values anywhere in infra/netris/.
  • Lab validation: Requires netris bare-metal lab access (make -C infra/netris e2e SUITE=caas). Will attach reports/caas.xml + terminal log once the lab run completes.

Note: The snapshot-flavor fast path (deploy-fast/deploy-ocp-snapshot) bakes the hub at the old OCP version and will need a separate rebuild. Validate via the full make deploy path for this change.

Acceptance Criteria

  • AC-1: E2E tests run against OCP 4.22 cluster — both the hub/management cluster and the CaaS target cluster
  • AC-2: All existing E2E tests pass on OCP 4.22 — pending live netris lab validation

Summary by CodeRabbit

  • Chores
    • Updated deployment configuration defaults and examples to use OpenShift 4.22.
    • Aligned CaaS discovery and release image settings with OpenShift 4.22.
    • Updated documentation to reflect the new OpenShift version requirements and deployment commands.
    • Added a labeled section for AI workflow artifacts in ignore configuration.

@openshift-ci-robot

openshift-ci-robot commented Jul 14, 2026 •

Copy link
Copy Markdown

@amej: This pull request references OSAC-2275 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 task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

OSAC-2275: Migrate E2E tests to OCP 4.22

Jira: https://redhat.atlassian.net/browse/OSAC-2275
Story type: Task

Summary

Bumps both OCP version pins used by the CaaS/BMaaS E2E flow in the netris backend to 4.22: the CaaS target-cluster pin (caas_ocp_version) and the hub/management-cluster pin (ocp_version). This lets the BMaaS flow use the new Metal3 BareMetalHost container-registry image reference feature shipped in OCP 4.22.

Changes

  • infra/netris/inventory/group_vars/all.yml:
  • caas_ocp_version: "4.19" → "4.22" — the CaaS target cluster. caas_release_image and post-osac.yml's OS-image filter already template off this variable.
  • ocp_version: "4.21" → "4.22" — the hub/management SNO cluster, installed via aicli/on-prem assisted-service. roles/ocp_install's openshift_version and roles/assisted_service's OS-image filter already template off this variable.
  • infra/netris/README.md: Updated documentation tables and examples to reflect the new 4.22 defaults.

Testing

  • Unit tests: N/A — no unit-testable code changed (Ansible variable values and docs only).
  • Integration tests: No new tests added. The existing tests/caas/test_cluster_create.py suite (unchanged) exercises the full CaaS lifecycle (create → verify ready via gRPC → delete → verify cleanup) and now runs against a hub and target both on OCP 4.22.
  • Coverage: pre-commit run --all-files (yamllint --strict + ansible-lint) passes. No remaining references to the old 4.19 or 4.21 values anywhere in infra/netris/.
  • Lab validation: Requires netris bare-metal lab access (make -C infra/netris e2e SUITE=caas). Will attach reports/caas.xml + terminal log once the lab run completes.

Note: The snapshot-flavor fast path (deploy-fast/deploy-ocp-snapshot) bakes the hub at the old OCP version and will need a separate rebuild. Validate via the full make deploy path for this change.

Acceptance Criteria

  • AC-1: E2E tests run against OCP 4.22 cluster — both the hub/management cluster and the CaaS target cluster
  • AC-2: All existing E2E tests pass on OCP 4.22 — pending live netris lab validation

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

coderabbitai Bot commented Jul 14, 2026 •

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository: osac-project/coderabbit/.coderabbit.yaml

Review profile: ASSERTIVE

Plan: Enterprise

Run ID: d6bee269-6f2f-4b19-97a7-80f6a97ac9e1

📥 Commits

Reviewing files that changed from the base of the PR and between 57fcd97 and afe1647.

📒 Files selected for processing (3)
  • .gitignore
  • infra/netris/README.md
  • infra/netris/inventory/group_vars/all.yml

Walkthrough

NetriS deployment configuration and documentation are updated from OpenShift 4.21—or CaaS 4.19—to 4.22. The .gitignore also adds a comment marking AI workflow artifacts.

Changes

NetriS OpenShift version alignment

Layer / File(s) Summary
Update deployment version configuration
infra/netris/inventory/group_vars/all.yml
The ocp_version and caas_ocp_version variables are set to 4.22.
Align deployment documentation
infra/netris/README.md
Deployment examples and documented OpenShift defaults are updated to 4.22.

Workflow artifact ignore marker

Layer / File(s) Summary
Add artifact section marker
.gitignore
Adds a comment header for AI workflow artifacts.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Possibly related PRs

Suggested labels: approved

Suggested reviewers: jhernand, omer-vishlitzky

🚥 Pre-merge checks | ✅ 11
✅ Passed checks (11 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed Title clearly matches the main change: migrating the E2E flow to OCP 4.22.
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.
No-Hardcoded-Secrets ✅ Passed Only version bumps/comment were added; no new secrets, tokens, passwords, or credentialed URLs appear in the diff.
No-Weak-Crypto ✅ Passed Touched lines only update OCP version pins/docs; no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB, custom crypto, or secret comparisons were added.
No-Injection-Vectors ✅ Passed Touched files are docs/.gitignore/YAML only; targeted search found no eval/exec/shell/pickle/yaml.load/os.system/dangerouslySetInnerHTML.
Container-Privileges ✅ Passed PASS — PR only changes README/.gitignore/Ansible vars; no container/K8s manifests or privileged/hostPID/hostNetwork/SYS_ADMIN/allowPrivilegeEscalation fields found.
No-Sensitive-Data-In-Logs ✅ Passed PR only updates version pins, README docs, and .gitignore; no new logging or secret/token/PII exposure was added.
Ai-Attribution ✅ Passed All 4 PR commits use 'Assisted-by: Claude Code' trailers, and no Co-Authored-By AI trailer appears.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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.

amej added 4 commits July 20, 2026 13:41
Assisted-by: Claude Code <noreply@anthropic.com>
Signed-off-by: Ameya Sathe <asathe@redhat.com>

rh-pre-commit.version: 2.4.0
rh-pre-commit.check-secrets: ENABLED
Assisted-by: Claude Code <noreply@anthropic.com>
Signed-off-by: Ameya Sathe <asathe@redhat.com>

rh-pre-commit.version: 2.4.0
rh-pre-commit.check-secrets: ENABLED
Assisted-by: Claude Code <noreply@anthropic.com>
Signed-off-by: Ameya Sathe <asathe@redhat.com>

rh-pre-commit.version: 2.4.0
rh-pre-commit.check-secrets: ENABLED
Assisted-by: Claude Code <noreply@anthropic.com>
Signed-off-by: Ameya Sathe <asathe@redhat.com>

rh-pre-commit.version: 2.4.0
rh-pre-commit.check-secrets: ENABLED
@openshift-ci

openshift-ci Bot commented Jul 20, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: amej, eliorerz

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 108994a into osac-project:main Jul 20, 2026
5 checks passed

This branch was previously deployed

1 inactive deployment
e2e-test — afe1647e Deployed Jul 20, 2026 by amej via e2e-vmaas-full-install / e2e #501
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants