Skip to content

USHIFT-7365: add dual-stack v4/v6 scenario symmetry to c2cc CI jobs#7027

Merged
agullon merged 3 commits into
openshift:mainfrom
agullon:USHIFT-7365
Jul 10, 2026
Merged

USHIFT-7365: add dual-stack v4/v6 scenario symmetry to c2cc CI jobs#7027
agullon merged 3 commits into
openshift:mainfrom
agullon:USHIFT-7365

Conversation

@agullon

@agullon agullon commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Rename *@c2cc-dual-stack*@c2cc-dual-stack-v4 to make explicit that IPv4 is the primary stack
  • Add el102-src@c2cc-dual-stack-v6 scenario (IPv6 primary, EL10)
  • Add el98-src@c2cc-dual-stack-v4 scenario (IPv4 primary, EL9)

Details

The c2cc CI jobs had asymmetric dual-stack coverage: el102 only had c2cc-dual-stack (IPv4 primary) and el98 only had c2cc-dual-stack-v6 (IPv6 primary). This PR adds the missing variants so both RHEL versions test both dual-stack orderings.

End state (13 scenarios)

Scenario EL10 EL9
c2cc (base)
c2cc-ipsec
c2cc-ipv6
c2cc-dual-stack-v4 ✅ (renamed) ✅ (new)
c2cc-dual-stack-v6 ✅ (new)
c2cc-disruptive
c2cc-upgrade-ok

Test plan

  • Verify new scenario files match the structure of existing ones
  • Run c2cc CI job to validate new scenarios boot and pass

🤖 Generated with Claude Code

Summary by CodeRabbit

  • New Features

    • Added dual-stack networking test scenarios for IPv4- and IPv6-primary configurations across three clusters.
    • Added automated virtual machine setup, cleanup, host configuration, and test execution for these scenarios.
  • Documentation

    • Clarified IP command selection behavior for dual-stack testing, including IPv4 and IPv6 handling.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 9, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 9, 2026

Copy link
Copy Markdown

@agullon: This pull request references USHIFT-7365 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 story to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

  • Rename *@c2cc-dual-stack*@c2cc-dual-stack-v4 to make explicit that IPv4 is the primary stack
  • Add el102-src@c2cc-dual-stack-v6 scenario (IPv6 primary, EL10)
  • Add el98-src@c2cc-dual-stack-v4 scenario (IPv4 primary, EL9)
  • Sort c2cc scenarios by expected duration (shortest first) for faster CI feedback

Details

The c2cc CI jobs had asymmetric dual-stack coverage: el102 only had c2cc-dual-stack (IPv4 primary) and el98 only had c2cc-dual-stack-v6 (IPv6 primary). This PR adds the missing variants so both RHEL versions test both dual-stack orderings.

Scenario ordering

Added sort_scenarios_shortest_first() to ci_phase_boot_and_test.sh that sorts c2cc scenarios by expected duration before passing them to GNU parallel. Based on observed CI runtimes: ipsec (~15min) < ipv6/base (~25min) < dual-stack (~26min) < upgrade (~30min) < disruptive (~35min).

End state (13 scenarios)

Scenario EL10 EL9
c2cc (base)
c2cc-ipsec
c2cc-ipv6
c2cc-dual-stack-v4 ✅ (renamed) ✅ (new)
c2cc-dual-stack-v6 ✅ (new)
c2cc-disruptive
c2cc-upgrade-ok

Test plan

  • Verify new scenario files match the structure of existing ones
  • Run c2cc CI job to validate new scenarios boot and pass
  • Verify scenario ordering in joblog matches expected shortest-first order

🤖 Generated with Claude Code

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.

@openshift-ci openshift-ci Bot requested review from eslutsky and jerpeter1 July 9, 2026 13:02
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 9, 2026
@coderabbitai

coderabbitai Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

Note

Reviews paused

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

Adds IPv4-primary and IPv6-primary dual-stack C2CC bootc scenario scripts, including cluster CIDRs, domains, VM lifecycle hooks, host configuration, and test execution. Clarifies IP command selection for dual-stack IPv4 and IPv6 testing.

Changes

Dual-stack C2CC bootc scenarios

Layer / File(s) Summary
IPv4-primary dual-stack scenario
test/scenarios-bootc/c2cc/el98-src@c2cc-dual-stack-v4.sh, test/scenarios-bootc/c2cc/el102-src@c2cc-dual-stack-v4.sh
Defines IPv4-primary and IPv6-secondary cluster networking, creates and removes dual-stack VMs, configures hosts, runs the basic suite, and documents IP command selection.
IPv6-primary dual-stack scenario
test/scenarios-bootc/c2cc/el102-src@c2cc-dual-stack-v6.sh
Adds IPv6-primary cluster networking with IPv4 secondary CIDRs and runs the IPv6-focused C2CC suite through standard scenario hooks.

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

Possibly related PRs

Suggested reviewers: jerpeter1, pmtk

🚥 Pre-merge checks | ✅ 4 | ❌ 11

❌ Failed checks (1 warning, 10 inconclusive)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 12.50% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
Stable And Deterministic Test Names ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Test Structure And Quality ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Microshift Test Compatibility ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Single Node Openshift (Sno) Test Compatibility ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Topology-Aware Scheduling Compatibility ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Ote Binary Stdout Contract ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Ipv6 And Disconnected Network Test Compatibility ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
No-Weak-Crypto ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Container-Privileges ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
No-Sensitive-Data-In-Logs ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
✅ Passed checks (4 passed)
Check name Status Explanation
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.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately summarizes the PR’s main change: making c2cc dual-stack v4/v6 CI scenarios symmetric.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@coderabbitai 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 9, 2026
@coderabbitai coderabbitai Bot removed the ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review label Jul 9, 2026

@vimauro vimauro 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.

I haven't anything to flag, lgtm !

@vimauro

vimauro commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 9, 2026
@agullon

agullon commented Jul 9, 2026

Copy link
Copy Markdown
Contributor Author

/verified by CI

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jul 9, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@agullon: This PR has been marked as verified by CI.

Details

In response to this:

/verified by CI

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.

@agullon

agullon commented Jul 9, 2026

Copy link
Copy Markdown
Contributor Author

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 9, 2026
agullon added 3 commits July 10, 2026 08:37
Make explicit that the existing dual-stack scenario uses IPv4 as the
primary stack.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

pre-commit.check-secrets: ENABLED
Add el102-src@c2cc-dual-stack-v6 (IPv6 primary, EL10) and
el98-src@c2cc-dual-stack-v4 (IPv4 primary, EL9) so both RHEL
versions test both dual-stack IP orderings.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

pre-commit.check-secrets: ENABLED
Add the same IP_FAMILY behavior comment that the v6 scenarios have,
explaining how IP_CMD defaults to 'ip -4' for primary CIDRs.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

pre-commit.check-secrets: ENABLED
@openshift-ci-robot openshift-ci-robot removed the verified Signifies that the PR passed pre-merge verification criteria label Jul 10, 2026
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 10, 2026

Copy link
Copy Markdown

@agullon: This pull request references USHIFT-7365 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 story to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

  • Rename *@c2cc-dual-stack*@c2cc-dual-stack-v4 to make explicit that IPv4 is the primary stack
  • Add el102-src@c2cc-dual-stack-v6 scenario (IPv6 primary, EL10)
  • Add el98-src@c2cc-dual-stack-v4 scenario (IPv4 primary, EL9)

Details

The c2cc CI jobs had asymmetric dual-stack coverage: el102 only had c2cc-dual-stack (IPv4 primary) and el98 only had c2cc-dual-stack-v6 (IPv6 primary). This PR adds the missing variants so both RHEL versions test both dual-stack orderings.

End state (13 scenarios)

Scenario EL10 EL9
c2cc (base)
c2cc-ipsec
c2cc-ipv6
c2cc-dual-stack-v4 ✅ (renamed) ✅ (new)
c2cc-dual-stack-v6 ✅ (new)
c2cc-disruptive
c2cc-upgrade-ok

Test plan

  • Verify new scenario files match the structure of existing ones
  • Run c2cc CI job to validate new scenarios boot and pass

🤖 Generated with Claude Code

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.

@agullon

agullon commented Jul 10, 2026

Copy link
Copy Markdown
Contributor Author

/hold cancel

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 10, 2026
@pmtk

pmtk commented Jul 10, 2026

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2026
@agullon

agullon commented Jul 10, 2026

Copy link
Copy Markdown
Contributor Author

/verified by CI

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jul 10, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@agullon: This PR has been marked as verified by CI.

Details

In response to this:

/verified by CI

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.

@agullon

agullon commented Jul 10, 2026

Copy link
Copy Markdown
Contributor Author

@coderabbitai review

@coderabbitai

coderabbitai Bot commented Jul 10, 2026

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

@agullon

agullon commented Jul 10, 2026

Copy link
Copy Markdown
Contributor Author

@coderabbitai resolve

@agullon

agullon commented Jul 10, 2026

Copy link
Copy Markdown
Contributor Author

@coderabbitai full review

@coderabbitai

coderabbitai Bot commented Jul 10, 2026

Copy link
Copy Markdown
Contributor
✅ Action performed

Comments resolved and changes approved.

@openshift-ci-robot openshift-ci-robot removed the verified Signifies that the PR passed pre-merge verification criteria label Jul 10, 2026
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2026
@vimauro

vimauro commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2026
@openshift-ci

openshift-ci Bot commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agullon, pmtk, vimauro

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

@vimauro

vimauro commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

@coderabbitai ignore

@coderabbitai

coderabbitai Bot commented Jul 10, 2026

Copy link
Copy Markdown
Contributor
✅ Action performed

Reviews paused.

@openshift-ci

openshift-ci Bot commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

@agullon: 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 6864b74 link true /test e2e-aws-tests-bootc-periodic-el10
ci/prow/e2e-aws-tests-bootc-periodic-arm-el10 6864b74 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.

@agullon

agullon commented Jul 10, 2026

Copy link
Copy Markdown
Contributor Author

/verified by CI

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jul 10, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@agullon: This PR has been marked as verified by CI.

Details

In response to this:

/verified by CI

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.

@agullon

agullon commented Jul 10, 2026

Copy link
Copy Markdown
Contributor Author

I'll manually push Merge pull request button because:

CodeRabbit / ReviewStarted 5 hours ago — CodeRabbit Review Progress

@agullon agullon merged commit 5967771 into openshift:main Jul 10, 2026
14 of 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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants