Consolidate c2cc test suites into grouped subdirectories and normalize naming by vimauro · Pull Request #7013 · openshift/microshift

vimauro · 2026-07-08T13:06:03Z

Summary by CodeRabbit

New Features
- Added shared C2CC suite setup/teardown and “full stack” aggregate verification (connectivity, DNS, health probes, overall health).
- Added/expanded C2CC test suites for basic connectivity and disruptive reboot scenarios; added a sequential C2CC upgrade suite.
Bug Fixes
- Standardized verification steps into clearer “Verify …” keywords and improved infrastructure validation, including an added tracking annotation check.
Tests
- Narrowed which scenario suites run (basic/disruptive/ipsec/upgrade) and removed runner support for --include tag filtering.
- Centralized suite lifecycle wiring and retired older connectivity/reboot suites.

vimauro · 2026-07-08T13:06:18Z

/label tide/merge-method-squash

coderabbitai · 2026-07-08T13:06:34Z

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

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: bfa5ab51-3793-46a0-81cd-6653188cd8a2

📥 Commits

Reviewing files that changed from the base of the PR and between ed9b98f and 9b8483e.

📒 Files selected for processing (4)

test/scenarios-bootc/c2cc/el102-src@c2cc-dual-stack.sh
test/scenarios-bootc/c2cc/el98-src@c2cc-dual-stack-v6.sh
test/suites/c2cc/basic/infrastructure.robot
test/suites/c2cc/upgrade/upgrade-c2cc.robot

🚧 Files skipped from review as they are similar to previous changes (2)

test/suites/c2cc/basic/infrastructure.robot
test/suites/c2cc/upgrade/upgrade-c2cc.robot

Walkthrough

C2CC test execution now uses shared suite setup/teardown and renamed verification keywords. Scenario scripts point to narrower or renamed suite directories, and disruptive, reboot, ipsec, and upgrade suites reuse the shared orchestration.

Changes

C2CC suite refactor

Layer / File(s)	Summary
Runner and scenario paths `test/bin/c2cc_common.sh`, `test/scenarios-bootc/c2cc/el{98,102}-src@*.sh`	Removes include-tag argument handling from `c2cc_run_tests` and updates scenario invocations to the new C2CC suite paths.
Shared keywords and basic suites `test/resources/c2cc.resource`, `test/suites/c2cc/basic/{cleanup,custom-route-tables,dns,healthcheck,infrastructure,probe,reconciliation,sanity}.robot`, `test/suites/c2cc/basic/connectivity.robot`	Renames shared verification keywords, adds shared suite orchestration helpers, and rewires the basic suites to use them.
Disruptive, reboot, ipsec, and upgrade flows `test/suites/c2cc/disruptive/{disruptive,reboot}.robot`, `test/suites/c2cc/ipsec/ipsec.robot`, `test/suites/c2cc/upgrade/upgrade-c2cc.robot`	Moves disruptive and ipsec suites onto shared lifecycle keywords, adds reboot scenarios, and introduces sequential upgrade validation with bootc and reboot checks.

Estimated code review effort: 4 (Complex) | ~60 minutes

Suggested labels: ready-for-human-review

🚥 Pre-merge checks | ✅ 15

✅ Passed checks (15 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately summarizes the two main changes: reorganizing C2CC suites into subdirectories and normalizing keyword/test naming.
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 diff only changes shell and Robot Framework files; no Ginkgo It/Describe/Context/When titles or dynamic test names are present.
Test Structure And Quality	✅ Passed	PR changes only .sh and .robot files; no Ginkgo/Go test code is touched, so the check is not applicable.
Microshift Test Compatibility	✅ Passed	PASS: PR only adds Robot/shell C2CC suites; no new Ginkgo tests, MicroShift skip tags, or unsupported OpenShift APIs/features were found.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	PR only changes shell and Robot Framework files; no Go/Ginkgo e2e tests were added, so the SNO-specific check is not applicable.
Topology-Aware Scheduling Compatibility	✅ Passed	PR only reorganizes C2CC Robot test suites/resources; no deployment manifests, operators, or controllers were modified, and no scheduling constraints were introduced.
Ote Binary Stdout Contract	✅ Passed	Diff only touches Robot/shell test harness files; no main/init/TestMain or binary code, and no process-level stdout writes found.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	PASS: PR adds Robot suites/scripts only; no new Ginkgo tests, and the added C2CC flows use cluster-internal checks without public internet dependence or IPv4-only parsing.
No-Weak-Crypto	✅ Passed	Patch only reshapes C2CC test files; strict diff scan found no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB or secret/token comparisons.
Container-Privileges	✅ Passed	No touched file is a container/K8s manifest, and searches of the changed files found none of the flagged privilege settings.
No-Sensitive-Data-In-Logs	✅ Passed	PASS — the diff only narrows suite paths and retries an existing check; no new log/echo statements or secret/PII interpolation were added.

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

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

openshift-ci · 2026-07-08T13:07:33Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: vimauro
Once this PR has been reviewed and has the lgtm label, please assign jerpeter1 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:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

coderabbitai

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 `@test/suites/c2cc/upgrade/upgrade-c2cc.robot`:
- Around line 39-42: The baseline flow in upgrade-c2cc.robot jumps from Deploy
Test Workloads straight to Verify Full C2CC Connectivity, unlike the upgrade
loop that waits first; add the same readiness gating before the initial
connectivity check by calling Wait For Test Pods and Wait For Service Endpoints
in this sequence near the existing Verify All Clusters Healthy and Verify All
RemoteClusters Healthy steps.

🪄 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: Enterprise

Run ID: c92d2be6-27d1-4268-a706-28a502adaebd

📥 Commits

Reviewing files that changed from the base of the PR and between d4dc9fc and 5a2067b.

📒 Files selected for processing (27)

test/bin/c2cc_common.sh
test/resources/c2cc.resource
test/scenarios-bootc/c2cc/el102-src@c2cc-disruptive.sh
test/scenarios-bootc/c2cc/el102-src@c2cc-ipsec.sh
test/scenarios-bootc/c2cc/el102-src@c2cc-ipv6.sh
test/scenarios-bootc/c2cc/el102-src@c2cc.sh
test/scenarios-bootc/c2cc/el98-src@c2cc-disruptive.sh
test/scenarios-bootc/c2cc/el98-src@c2cc-ipsec.sh
test/scenarios-bootc/c2cc/el98-src@c2cc-ipv6.sh
test/scenarios-bootc/c2cc/el98-src@c2cc.sh
test/scenarios-bootc/c2cc/el98-src@el102-src@c2cc-upgrade-ok.sh
test/suites/c2cc/basic/cleanup.robot
test/suites/c2cc/basic/connectivity.robot
test/suites/c2cc/basic/custom-route-tables.robot
test/suites/c2cc/basic/dns.robot
test/suites/c2cc/basic/healthcheck.robot
test/suites/c2cc/basic/infrastructure.robot
test/suites/c2cc/basic/probe.robot
test/suites/c2cc/basic/reconciliation.robot
test/suites/c2cc/basic/sanity.robot
test/suites/c2cc/connectivity.robot
test/suites/c2cc/disruptive/disruptive.robot
test/suites/c2cc/disruptive/reboot.robot
test/suites/c2cc/ipsec/ipsec.robot
test/suites/c2cc/reboot.robot
test/suites/c2cc/upgrade/upgrade-c2cc.robot
test/suites/upgrade/upgrade-c2cc.robot

💤 Files with no reviewable changes (4)

test/suites/c2cc/connectivity.robot
test/suites/upgrade/upgrade-c2cc.robot
test/suites/c2cc/reboot.robot
test/bin/c2cc_common.sh

vimauro · 2026-07-08T14:49:32Z

@coderabbitai review

coderabbitai · 2026-07-08T14:49:39Z

✅ Action performed

Review finished.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

openshift-ci · 2026-07-08T17:42:44Z

@vimauro: 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/prow/e2e-aws-tests-bootc-periodic-el10	`9b8483e`	link	true	`/test e2e-aws-tests-bootc-periodic-el10`
ci/prow/e2e-aws-tests-bootc-periodic-arm-el10	`9b8483e`	link	true	`/test e2e-aws-tests-bootc-periodic-arm-el10`

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.

openshift-ci Bot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jul 8, 2026

openshift-ci Bot requested review from jerpeter1 and pmtk July 8, 2026 13:07

coderabbitai Bot requested changes Jul 8, 2026

View reviewed changes

Comment thread test/suites/c2cc/upgrade/upgrade-c2cc.robot Outdated

coderabbitai Bot approved these changes Jul 8, 2026

View reviewed changes

vimauro added 5 commits July 8, 2026 16:33

Initial consolidation of c2cc tests

05debe2

consolidation of dual stack tests

de67d44

linter fixes

395d941

make verify-rf happy

abb1a03

rebased from main

ed9b98f

vimauro force-pushed the consolidations branch from 4c300ce to ed9b98f Compare July 8, 2026 14:43

agullon reviewed Jul 8, 2026

View reviewed changes

Comment thread test/suites/c2cc/upgrade/upgrade-c2cc.robot Outdated

agullon reviewed Jul 8, 2026

View reviewed changes

Comment thread test/suites/c2cc/upgrade/upgrade-c2cc.robot Outdated

agullon reviewed Jul 8, 2026

View reviewed changes

Comment thread test/suites/c2cc/basic/infrastructure.robot Outdated

addressed PR comments

9b8483e

coderabbitai Bot added the ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review label Jul 8, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Consolidate c2cc test suites into grouped subdirectories and normalize naming#7013

Consolidate c2cc test suites into grouped subdirectories and normalize naming#7013
vimauro wants to merge 6 commits into
openshift:mainfrom
vimauro:consolidations

vimauro commented Jul 8, 2026 •

edited by coderabbitai Bot

Loading

Uh oh!

vimauro commented Jul 8, 2026

Uh oh!

coderabbitai Bot commented Jul 8, 2026 •

edited

Loading

Reviews paused

Uh oh!

openshift-ci Bot commented Jul 8, 2026

Uh oh!

coderabbitai Bot left a comment

Uh oh!

Uh oh!

vimauro commented Jul 8, 2026

Uh oh!

coderabbitai Bot commented Jul 8, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

openshift-ci Bot commented Jul 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

vimauro commented Jul 8, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

vimauro commented Jul 8, 2026

Uh oh!

coderabbitai Bot commented Jul 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviews paused

Walkthrough

Changes

Uh oh!

openshift-ci Bot commented Jul 8, 2026

Uh oh!

coderabbitai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vimauro commented Jul 8, 2026

Uh oh!

coderabbitai Bot commented Jul 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

openshift-ci Bot commented Jul 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

vimauro commented Jul 8, 2026 •

edited by coderabbitai Bot

Loading

coderabbitai Bot commented Jul 8, 2026 •

edited

Loading

coderabbitai Bot commented Jul 8, 2026 •

edited

Loading