Skip to content

ROSAENG-62156 fix: add openshift version and channel group support for CAPA e2e - #82728

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
andclt:fix/capa-staging-openshift-version
Aug 3, 2026
Merged

ROSAENG-62156 fix: add openshift version and channel group support for CAPA e2e#82728
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
andclt:fix/capa-staging-openshift-version

Conversation

@andclt

@andclt andclt commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

Summary

This change allows the CAPA e2e periodic job to target latest stable HCP versions in staging.

Summary by CodeRabbit

The CAPA e2e periodic job now targets OpenShift 4.22 from the nightly channel in staging.

The rosa-e2e-capa step accepts OPENSHIFT_VERSION and CHANNEL_GROUP and passes them to the test suite. Empty values preserve repository defaults.

@coderabbitai

coderabbitai Bot commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review

Walkthrough

The ROSA Capa-E2E step now accepts optional OpenShift version and channel group values. The test configuration sets OpenShift 4.22 and the nightly channel. The command passes these values and name_prefix to run-test-suite.py.

Changes

ROSA Capa-E2E configuration

Layer / File(s) Summary
Configure and forward test parameters
ci-operator/step-registry/rosa/e2e/capa/rosa-e2e-capa-ref.yaml, ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main_capa-e2e.yaml, ci-operator/step-registry/rosa/e2e/capa/rosa-e2e-capa-commands.sh
The step defines optional OPENSHIFT_VERSION and CHANNEL_GROUP variables. The test configuration sets them to 4.22 and nightly. The command passes them with name_prefix to run-test-suite.py.

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

Suggested labels: rehearsals-ack

Suggested reviewers: serngawy, tiwillia

🚥 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.
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 PR changes only CI YAML and shell wiring; repository search found no Ginkgo It, Describe, Context, When, or Specify test titles to contain dynamic values.
Test Structure And Quality ✅ Passed The PR changes only CI YAML and a shell command; no Ginkgo test code or It blocks are present, so these test-structure requirements are not applicable.
Microshift Test Compatibility ✅ Passed The PR changes only CI YAML and a shell command; no new Ginkgo It/Describe/Context/When tests or MicroShift-incompatible API usage were found.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The PR changes only CI YAML and a shell command; no new Ginkgo It/Describe/Context/When tests or multi-node assumptions are introduced.
Topology-Aware Scheduling Compatibility ✅ Passed The PR changes CI configuration and a test-command wrapper only; no deployment manifest, operator, controller, or topology scheduling constraint is introduced.
Ote Binary Stdout Contract ✅ Passed The PR changes only YAML and shell configuration; the checkout contains no OTE binary, Ginkgo suite hook, or related process-level test code to violate stdout JSON output.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The change only updates CI YAML and shell parameter plumbing; it adds no Ginkgo test declarations or IPv4/external-connectivity logic.
No-Weak-Crypto ✅ Passed The changes only add CAPA test configuration and pass environment values; searches found no MD5, SHA1, DES, RC4, Blowfish, ECB, custom crypto, or secret comparisons in the relevant code.
Container-Privileges ✅ Passed The described changes only add environment variables and shell argument forwarding; checkout searches found no privileged, host namespace, SYS_ADMIN, or allowPrivilegeEscalation settings.
No-Sensitive-Data-In-Logs ✅ Passed The exact PR patch adds only non-sensitive version, channel, and random name-prefix arguments; no passwords, tokens, keys, PII, or new sensitive logging paths are introduced.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly summarizes the main change: adding OpenShift version and channel group support for CAPA e2e.
✨ 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.

@andclt andclt changed the title fix: add openshift version and channel group support for CAPA e2e ROSAENG-62156 fix: add openshift version and channel group support for CAPA e2e Jul 31, 2026
@openshift-ci
openshift-ci Bot requested review from serngawy and tiwillia July 31, 2026 13:49

@coderabbitai coderabbitai Bot 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.

Actionable comments posted: 1

🤖 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.

Inline comments:
In `@ci-operator/step-registry/rosa/e2e/capa/rosa-e2e-capa-commands.sh`:
- Around line 96-105: Update the EXTRA_VARS construction in the rosa-hcp-e2e
command flow to use a Bash array, appending each `-e` key/value pair as separate
elements and expanding it with `"${EXTRA_VARS[@]}"` when invoking
`run-test-suite.py`. Preserve the existing conditional variables and leave
`${TEST_SUITE}` unchanged.
🪄 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 YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: c73906e6-e611-42ca-aa28-4beb3deb1455

📥 Commits

Reviewing files that changed from the base of the PR and between c54020d and e4930f2.

📒 Files selected for processing (3)
  • ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main_capa-e2e.yaml
  • ci-operator/step-registry/rosa/e2e/capa/rosa-e2e-capa-commands.sh
  • ci-operator/step-registry/rosa/e2e/capa/rosa-e2e-capa-ref.yaml

Comment thread ci-operator/step-registry/rosa/e2e/capa/rosa-e2e-capa-commands.sh Outdated
@andclt

andclt commented Jul 31, 2026

Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-online-rosa-e2e-main_capa-e2e-capa-e2e

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@andclt
andclt force-pushed the fix/capa-staging-openshift-version branch from e4930f2 to 56bfbc4 Compare July 31, 2026 13:59
@andclt

andclt commented Jul 31, 2026

Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-online-rosa-e2e-main_capa-e2e-capa-e2e

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@andclt
andclt force-pushed the fix/capa-staging-openshift-version branch from 56bfbc4 to f8fc195 Compare July 31, 2026 16:00
@andclt

andclt commented Jul 31, 2026

Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-online-rosa-e2e-main_capa-e2e-capa-e2e

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@andclt
andclt force-pushed the fix/capa-staging-openshift-version branch from f8fc195 to 98eac09 Compare July 31, 2026 16:23
@andclt

andclt commented Jul 31, 2026

Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-online-rosa-e2e-main_capa-e2e-capa-e2e

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@andclt
andclt force-pushed the fix/capa-staging-openshift-version branch from 98eac09 to 7118c7d Compare August 3, 2026 11:19
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@andclt: 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
periodic-ci-openshift-online-rosa-e2e-main_capa-e2e-capa-e2e 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.

@andclt

andclt commented Aug 3, 2026

Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-online-rosa-e2e-main_capa-e2e-capa-e2e

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@andclt

andclt commented Aug 3, 2026

Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-online-rosa-e2e-main_capa-e2e-capa-e2e

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@andclt

andclt commented Aug 3, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@andclt

andclt commented Aug 3, 2026

Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-online-rosa-e2e-main_capa-e2e-capa-e2e

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@andclt
andclt force-pushed the fix/capa-staging-openshift-version branch from 7118c7d to 50ce263 Compare August 3, 2026 15:38
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@andclt: pj-rehearse could not automatically process this event because the request waited in queue for longer than 5 minutes. Use /pj-rehearse to trigger rehearsals manually.

@openshift-ci

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

@andclt: 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.

@dustman9000

Copy link
Copy Markdown
Member

/lgtm
/approve
/pj-rehearse ack

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@dustman9000: 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 Aug 3, 2026
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 3, 2026
@openshift-ci

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andclt, dustman9000

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 Aug 3, 2026
@openshift-merge-bot
openshift-merge-bot Bot merged commit 37c1add into openshift:main Aug 3, 2026
16 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. 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.

2 participants