Skip to content

terraform-redhat/rosa modules: consolidate presubmits to pre-push-checks#80215

Open
amandahla wants to merge 1 commit into
openshift:mainfrom
amandahla:OCM-24672-OCM-24673
Open

terraform-redhat/rosa modules: consolidate presubmits to pre-push-checks#80215
amandahla wants to merge 1 commit into
openshift:mainfrom
amandahla:OCM-24672-OCM-24673

Conversation

@amandahla

@amandahla amandahla commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Summary

Consolidate verify-format and verify-gen presubmit jobs into a single pre-push-checks job for all terraform-redhat/rosa modules across three branches (main, release-1.6.3, release-1.6.4).

Note: Only the six ci-operator/config/terraform-redhat/terraform-rhcs-rosa-{hcp,classic}/*.yaml files were edited by hand; the matching presubmit manifests under ci-operator/jobs/terraform-redhat/ were regenerated by make ci-operator-prowgen and should not be edited manually.

Type of change

ci

Related

OCM-24672, OCM-24673

Changes

  • Replace separate verify-format (make verify) and verify-gen presubmit jobs with a unified pre-push-checks job running make pre-push-checks
  • Applied to both terraform-rhcs-rosa-hcp and terraform-rhcs-rosa-classic repos
  • Regenerated Prow job manifests for all six affected config/branch combinations (12 files: 6 ci-operator configs + 6 presubmit job manifests)
  • Net reduction: 337 insertions / 751 deletions (roughly 50% fewer lines in job manifests)

Breaking changes

No.

Testing / validation

Prow job manifests regenerated via make update; make checkconfig validates Prow configuration. No logic change—job consolidation only.

Summary by CodeRabbit

This PR consolidates redundant CI presubmit checks for the terraform-rhcs ROSA modules into a single unified step.

What's changing

The PR updates CI operator configuration for two terraform-redhat repositories (terraform-rhcs-rosa-classic and terraform-rhcs-rosa-hcp) across three branches each (main, release-1.6.3, and release-1.6.4). Previously, these modules ran two separate presubmit verification steps:

  • verify-format – running make verify
  • verify-gen – running make verify-gen

These are now consolidated into a single pre-push-checks step that runs make pre-push-checks, which presumably includes both validations in one command.

Files modified

Six CI operator configuration files were edited directly under ci-operator/config/terraform-redhat/:

  • terraform-rhcs-rosa-classic/{main, release-1.6.3, release-1.6.4}.yaml
  • terraform-rhcs-rosa-hcp/{main, release-1.6.3, release-1.6.4}.yaml

The corresponding Prow job manifests under ci-operator/jobs/terraform-redhat/ were regenerated via make ci-operator-prowgen, resulting in 337 insertions and 751 deletions across the generated job definitions – a net reduction of approximately 50% of the manifest code.

Impact

  • No logic changes – the consolidation is purely organizational, combining existing checks into a single make target
  • Simpler CI execution – jobs now run fewer presubmit steps, reducing overhead
  • Improved maintainability – centralized check in make pre-push-checks rather than split across multiple targets

@coderabbitai

coderabbitai Bot commented Jun 8, 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: aa72bbec-83c3-4f6c-8f81-10505c1d500c

📥 Commits

Reviewing files that changed from the base of the PR and between 149fddc and f56c6ee.

⛔ Files ignored due to path filters (2)
  • ci-operator/jobs/terraform-redhat/terraform-rhcs-rosa-classic/terraform-redhat-terraform-rhcs-rosa-classic-main-presubmits.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/terraform-redhat/terraform-rhcs-rosa-hcp/terraform-redhat-terraform-rhcs-rosa-hcp-main-presubmits.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (2)
  • ci-operator/config/terraform-redhat/terraform-rhcs-rosa-classic/terraform-redhat-terraform-rhcs-rosa-classic-main.yaml
  • ci-operator/config/terraform-redhat/terraform-rhcs-rosa-hcp/terraform-redhat-terraform-rhcs-rosa-hcp-main.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
  • ci-operator/config/terraform-redhat/terraform-rhcs-rosa-classic/terraform-redhat-terraform-rhcs-rosa-classic-main.yaml

Walkthrough

Two CI operator configuration files for ROSA infrastructure variants consolidate their test verification steps. Separate verify-format and verify-gen test steps are replaced with a single always-run pre-push-checks step across both the classic and HCP ROSA configurations.

Changes

CI Test Consolidation

Layer / File(s) Summary
Consolidate verify and verify-gen steps to pre-push-checks in ROSA CI configs
ci-operator/config/terraform-redhat/terraform-rhcs-rosa-classic/terraform-redhat-terraform-rhcs-rosa-classic-main.yaml, ci-operator/config/terraform-redhat/terraform-rhcs-rosa-hcp/terraform-redhat-terraform-rhcs-rosa-hcp-main.yaml
In both terraform-rhcs-rosa-classic and terraform-rhcs-rosa-hcp CI operator configs, the prior always-run verify-format (make verify) and verify-gen (make verify-gen) steps are replaced by a single always-run pre-push-checks step running make pre-push-checks.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Suggested labels

lgtm, rehearsals-ack, jira/valid-reference

🚥 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 main change: consolidating multiple presubmit jobs into a single pre-push-checks job across terraform-redhat ROSA modules.
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 PR modifies only CI configuration YAML files for terraform-redhat repos, consolidating presubmit jobs. No Ginkgo test files or test code are changed, making this check not applicable.
Test Structure And Quality ✅ Passed PR modifies CI/CD configuration files (YAML), not Ginkgo test code. The custom check for Ginkgo test quality is inapplicable to this CI consolidation PR.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests are added in this PR. Changes are limited to CI configuration (YAML files), consolidating presubmit jobs for terraform-redhat modules.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR does not add any new Ginkgo e2e tests; it only modifies CI configuration YAML files to consolidate Terraform presubmit checks. The SNO compatibility check is inapplicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies only ci-operator configuration files (CI infrastructure metadata), not deployment manifests, operator code, or controllers. Check is not applicable.
Ote Binary Stdout Contract ✅ Passed PR modifies only CI configuration YAML files (ci-operator/config), not OTE test binaries or Go code. No stdout contract violations possible.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR modifies only CI-operator YAML configuration files and generated Prow manifests, not Ginkgo e2e tests. The custom check applies only to new test code, which is absent here.
No-Weak-Crypto ✅ Passed PR contains only CI/CD configuration changes (YAML files) to consolidate presubmit jobs. No cryptographic code, weak crypto patterns, or custom crypto implementations present.
Container-Privileges ✅ Passed No privileged container settings (privileged, hostPID, hostNetwork, hostIPC, SYS_ADMIN, allowPrivilegeEscalation, or root execution) found in any modified or generated container/K8s manifests.
No-Sensitive-Data-In-Logs ✅ Passed The PR consolidates presubmit jobs with no logging of sensitive data. The new pre-push-checks step runs make pre-push-checks without exposing credentials or debug information.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ 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 and usage tips.

@openshift-ci

openshift-ci Bot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: amandahla

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 Jun 8, 2026
@openshift-ci openshift-ci Bot requested review from davidleerh and gdbranco June 8, 2026 13:27
@amandahla

Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@amandahla

Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@amandahla

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-terraform-redhat-terraform-rhcs-rosa-hcp-release-1.6.4-pre-push-checks

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

Replace separate verify-format (make verify) and verify-gen presubmits
with a single pre-push-checks job running make pre-push-checks on main,
release-1.6.3, and release-1.6.4 for terraform-rhcs-rosa-hcp and
terraform-rhcs-rosa-classic. Regenerated prow job manifests.

Signed-off-by: Amanda Hager Lopes de Andrade Katz <amanda.katz@redhat.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
@amandahla amandahla force-pushed the OCM-24672-OCM-24673 branch from 149fddc to f56c6ee Compare June 8, 2026 15:45
@amandahla

Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@amandahla: 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
pull-ci-terraform-redhat-terraform-rhcs-rosa-classic-main-pre-push-checks terraform-redhat/terraform-rhcs-rosa-classic presubmit Presubmit changed
pull-ci-terraform-redhat-terraform-rhcs-rosa-hcp-main-pre-push-checks terraform-redhat/terraform-rhcs-rosa-hcp presubmit Presubmit 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.

@amandahla

Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@amandahla

Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@amandahla

Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@amandahla

Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@amandahla

Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@amandahla

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-terraform-redhat-terraform-rhcs-rosa-hcp-main-pre-push-checks

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@openshift-ci

openshift-ci Bot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

@amandahla: 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/rehearse/terraform-redhat/terraform-rhcs-rosa-classic/release-1.6.3/pre-push-checks 149fddc link unknown /pj-rehearse pull-ci-terraform-redhat-terraform-rhcs-rosa-classic-release-1.6.3-pre-push-checks
ci/rehearse/terraform-redhat/terraform-rhcs-rosa-hcp/release-1.6.4/pre-push-checks 149fddc link unknown /pj-rehearse pull-ci-terraform-redhat-terraform-rhcs-rosa-hcp-release-1.6.4-pre-push-checks
ci/rehearse/terraform-redhat/terraform-rhcs-rosa-classic/release-1.6.4/pre-push-checks 149fddc link unknown /pj-rehearse pull-ci-terraform-redhat-terraform-rhcs-rosa-classic-release-1.6.4-pre-push-checks
ci/rehearse/terraform-redhat/terraform-rhcs-rosa-hcp/release-1.6.3/pre-push-checks 149fddc link unknown /pj-rehearse pull-ci-terraform-redhat-terraform-rhcs-rosa-hcp-release-1.6.3-pre-push-checks

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

approved Indicates a PR has been approved by an approver from all required OWNERS files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant