Skip to content

USHIFT-7298: Consistent tag-based test selection in c2cc scenarios#7028

Closed
vimauro wants to merge 1 commit into
openshift:mainfrom
vimauro:c2cc_run_tests_consistency
Closed

USHIFT-7298: Consistent tag-based test selection in c2cc scenarios#7028
vimauro wants to merge 1 commit into
openshift:mainfrom
vimauro:c2cc_run_tests_consistency

Conversation

@vimauro

@vimauro vimauro commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

Summary by CodeRabbit

  • New Features

    • Expanded test selection support so more suite tags can be targeted from a single test runner command.
    • Added clearer tagging for basic, disruptive, upgrade, and IPsec scenarios.
  • Bug Fixes

    • Improved test suite targeting to run the intended scenario groups more reliably across multiple environments.
    • Updated several scenarios to use consistent suite selection patterns.

@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

@vimauro: This pull request references USHIFT-7298 which is a valid jira issue.

Details

In response to this:

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 9, 2026

Copy link
Copy Markdown
Contributor

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: 30e8437b-eb5e-49d8-adb6-20573d4fee3d

📥 Commits

Reviewing files that changed from the base of the PR and between ba06055 and 1e9f8e5.

📒 Files selected for processing (24)
  • test/bin/c2cc_common.sh
  • test/scenarios-bootc/c2cc/el102-src@c2cc-disruptive.sh
  • test/scenarios-bootc/c2cc/el102-src@c2cc-dual-stack.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-dual-stack-v6.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/disruptive/disruptive.robot
  • test/suites/c2cc/disruptive/reboot.robot
  • test/suites/c2cc/upgrade/upgrade-c2cc.robot

Walkthrough

This PR adds configurable --include tag support to c2cc_run_tests in c2cc_common.sh, updates scenario scripts to call c2cc_run_tests against the broader suites/c2cc/ directory with explicit selector arguments (disruptive, basic, ipsec, ipv6, upgrade), and adds matching Robot Framework Test Tags to corresponding suite files.

Changes

C2CC tag-based test selection

Layer / File(s) Summary
Include-tag argument construction
test/bin/c2cc_common.sh
c2cc_run_tests gains an include_tags parameter (default c2cc), builds --include <tag> arguments per tag, and passes them into the run_tests invocation.
Scenario scripts pass broader path plus selectors
test/scenarios-bootc/c2cc/el102-src@*.sh, test/scenarios-bootc/c2cc/el98-src@*.sh
Scenario scripts change c2cc_run_tests calls from narrow suite subdirectory paths to suites/c2cc/ plus explicit selector arguments (disruptive, basic, ipsec, ipv6, upgrade).
Robot suite Test Tags updated
test/suites/c2cc/basic/*.robot, test/suites/c2cc/disruptive/*.robot, test/suites/c2cc/upgrade/upgrade-c2cc.robot
Suite-level Test Tags extended (e.g. adding basic, c2cc, or upgrade) to align with selector-based include filtering.

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

Possibly related PRs

Suggested reviewers: jerpeter1, kasturinarra

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (14 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 main change: making c2cc scenario test selection consistent via tags.
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 only updates shell/Robot tag selection; no Ginkgo It/Describe/Context titles were added or changed, so there are no unstable test names.
Test Structure And Quality ✅ Passed Only shell/Robot Framework tag-selection files changed; no Ginkgo It/BeforeEach/Eventually test code was modified, so this check is N/A.
Microshift Test Compatibility ✅ Passed PASS: The PR only retags existing Robot suites and updates c2cc wrapper args; no new Ginkgo e2e tests or new OpenShift API/resource usage were added.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; this PR only retags Robot suites and updates shell test selection, so the SNO check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed Diff only touches C2CC test scripts and Robot suite tags; no deployment manifests, controllers, or topology/scheduling constraints were introduced.
Ote Binary Stdout Contract ✅ Passed Diff only updates c2cc test selection/tag metadata in shell/Robot files; no OTE binary main/init/TestMain/RunSpecs stdout writes were added.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Only shell/Robot changes; no new Ginkgo tests or public-host/IPV4-only assumptions were added, and IPv6 URLs are bracketed.
No-Weak-Crypto ✅ Passed No weak crypto, custom crypto, or secret-comparison changes appear in the diff; it only adjusts c2cc test selection and tags.
Container-Privileges ✅ Passed The PR only changes test shell/Robot files; no K8s/container manifests were modified and no privileged/hostPID/hostNetwork/hostIPC/allowPrivilegeEscalation settings appear in the touched files.
No-Sensitive-Data-In-Logs ✅ Passed Changed files only adjust test tag selection and helper args; no new logging or sensitive-value output was added.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci openshift-ci Bot requested review from copejon and ggiguash July 9, 2026 13:24
@openshift-ci

openshift-ci Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

[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 pacevedom 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:

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

@vimauro vimauro closed this Jul 9, 2026
@openshift-ci

openshift-ci Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

@vimauro: 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/prow/e2e-aws-tests-periodic-arm 1e9f8e5 link true /test e2e-aws-tests-periodic-arm

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

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants