Skip to content

ROSAENG-57139 | ci: Remove skip_if_only_changed from optional provider e2e presubmits#80912

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
amandahla:ROSAENG-57139-fix-optional-e2e-skip
Jun 23, 2026
Merged

ROSAENG-57139 | ci: Remove skip_if_only_changed from optional provider e2e presubmits#80912
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
amandahla:ROSAENG-57139-fix-optional-e2e-skip

Conversation

@amandahla

@amandahla amandahla commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

Summary

Restore manual-only triggering for optional terraform-provider-rhcs e2e presubmits by removing skip_if_only_changed from tests marked optional: true, while keeping doc-only skip on the four critical-high presubmits and variant image builds.

Type of change

ci

Related

ROSAENG-57139
Follow-up to #80765

Changes

  • Remove skip_if_only_changed from 18 optional tests in terraform-redhat-terraform-provider-rhcs-main__e2e-presubmits.yaml (including rosa-hcp-arm-critical-high-presubmit).
  • Keep skip_if_only_changed on rosa-sts-advanced-critical-high-presubmit, rosa-sts-private-critical-high-presubmit, rosa-hcp-advanced-critical-high-presubmit, and rosa-hcp-private-critical-high-presubmit.
  • Keep variant-level images.skip_if_only_changed unchanged.
  • Regenerate presubmit jobs with make jobs WHAT=terraform-redhat/terraform-provider-rhcs.

Breaking changes

No.

Testing / validation

  • make jobs WHAT=terraform-redhat/terraform-provider-rhcs (includes ci-operator-checkconfig and sanitize-prow-jobs).
  • Verified generated optional presubmits have always_run: false and no skip_if_only_changed; critical-high presubmits retain skip_if_only_changed.

Made with Cursor

Summary by CodeRabbit

This PR removes the skip_if_only_changed configuration from 18 optional terraform-provider-rhcs E2E presubmit tests in the OpenShift CI system.

Practical Impact:
The change restores manual-only triggering behavior for optional tests. Previously, PR #80765 added skip_if_only_changed globally to all E2E presubmits, which inadvertently caused optional tests to auto-run on every non-documentation PR. This PR corrects that by restricting the skip behavior to only the four critical-high presubmits (rosa-sts-advanced-critical-high-presubmit, rosa-sts-private-critical-high-presubmit, rosa-hcp-advanced-critical-high-presubmit, and rosa-hcp-private-critical-high-presubmit). Optional tests like rosa-hcp-arm-critical-high-presubmit and other optional variants will now require manual triggering as intended.

Configuration Changes:

  • 18 optional presubmit tests in terraform-redhat-terraform-provider-rhcs-main__e2e-presubmits.yaml have the skip_if_only_changed field removed
  • 4 critical-high presubmits retain their skip_if_only_changed configuration
  • Variant-level image build configurations remain unchanged
  • Generated Prow job definitions were regenerated using make jobs

No breaking changes are introduced by this PR.

…r e2e presubmits

PR openshift#80765 added skip_if_only_changed to all e2e-presubmits tests, which
caused optional jobs to auto-run on every non-doc PR. Keep doc-only skip on
the four critical-high presubmits and variant image builds only.

Signed-off-by: Amanda Hager Lopes de Andrade Katz <amanda.katz@redhat.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
@coderabbitai

coderabbitai Bot commented Jun 23, 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: c9df5b3e-eaaa-458e-b0b5-814ba074e380

📥 Commits

Reviewing files that changed from the base of the PR and between 940e9ac and 3d41fa9.

⛔ Files ignored due to path filters (1)
  • ci-operator/jobs/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main-presubmits.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (1)
  • ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main__e2e-presubmits.yaml
💤 Files with no reviewable changes (1)
  • ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main__e2e-presubmits.yaml

Walkthrough

The skip_if_only_changed field is removed from 18 optional rosa-* E2E presubmit jobs in the terraform-redhat-terraform-provider-rhcs-main__e2e-presubmits.yaml CI configuration file. Affected jobs span rosa-sts, rosa-hcp, rosa-classic, and rosa-day1-supplemental variants.

Changes

CI Presubmit Config Update

Layer / File(s) Summary
Remove skip_if_only_changed from all rosa-* presubmit jobs
ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main__e2e-presubmits.yaml
Deletes the skip_if_only_changed field from 18 optional presubmit job entries: rosa-sts-advanced, rosa-sts-private, rosa-sts-shared-vpc, rosa-sts-advanced-day1-negative, rosa-sts-private-day1-negative, rosa-sts-upgrade-y/z, rosa-classic-full-resources, rosa-hcp-arm-critical-high, rosa-hcp-advanced, rosa-hcp-private, rosa-hcp-arm, rosa-hcp-network, rosa-hcp-encryption, rosa-hcp-upgrade-y/z, rosa-hcp-full-resources, and rosa-day1-supplemental.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Possibly related PRs

  • openshift/release#80765: Directly related — modifies skip_if_only_changed rules on the same rosa-* e2e presubmit job entries in the same file that this PR reverses.

Suggested reviewers

  • olucasfreitas
  • BraeTroutman
🚥 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 clearly and specifically describes the main change: removing skip_if_only_changed from optional e2e presubmits, directly aligned with the changeset.
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 only modifies CI/CD pipeline YAML configuration, not Ginkgo test code. The custom check for stable test names is not applicable to this PR.
Test Structure And Quality ✅ Passed Check is not applicable: PR contains only CI/CD configuration file changes and no Ginkgo test code to review against quality requirements.
Microshift Test Compatibility ✅ Passed This PR only modifies CI configuration (removing skip_if_only_changed from optional tests), not adding new Ginkgo e2e tests. Check only applies when tests are added.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR only modifies CI operator YAML configuration to remove skip_if_only_changed fields from optional test jobs. No new Ginkgo e2e tests are added, so the SNO compatibility check does not apply.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies only CI-operator test configuration (skip_if_only_changed fields in presubmit jobs), not deployment manifests, operator code, or controllers. No scheduling constraints, pod affinity, no...
Ote Binary Stdout Contract ✅ Passed PR modifies only YAML CI configuration; no Go source code or OTE binary implementation changes. OTE stdout contract check does not apply to CI config-only modifications.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR does not add any new Ginkgo e2e tests—it only modifies CI configuration files. The custom check applies only when new tests are added, which is not the case here.
No-Weak-Crypto ✅ Passed PR modifies only a CI configuration YAML file removing test skip conditions; contains no cryptographic implementations, weak ciphers, or custom crypto code.
Container-Privileges ✅ Passed No privileged container configurations (privileged:true, hostPID, hostNetwork, hostIPC, SYS_ADMIN, allowPrivilegeEscalation) found in the PR. File contains only CI operator configuration without co...
No-Sensitive-Data-In-Logs ✅ Passed No sensitive data (passwords, tokens, API keys, PII, session IDs, or internal hostnames) found in the modified CI configuration file. All environment variables contain non-sensitive configuration v...

✏️ 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.

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 23, 2026
@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-provider-rhcs-main-e2e-presubmits-rosa-classic-full-resources-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-day1-supplemental-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-advanced-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-arm-critical-high-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-arm-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-encryption-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-full-resources-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-network-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-private-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-upgrade-y-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-upgrade-z-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-advanced-day1-negative-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-advanced-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-private-day1-negative-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-private-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-shared-vpc-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-upgrade-y-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-upgrade-z-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

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.

@jerichokeyne

Copy link
Copy Markdown
Contributor

/lgtm
/approve

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

openshift-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: amandahla, jerichokeyne

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

@amandahla

Copy link
Copy Markdown
Contributor Author

/check-required-labels

@jerichokeyne

Copy link
Copy Markdown
Contributor

/pj-rehearse ack

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@jerichokeyne: 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 Jun 23, 2026
@openshift-ci

openshift-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

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

@openshift-merge-bot openshift-merge-bot Bot merged commit 87f0415 into openshift:main Jun 23, 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