Skip to content

[faas-console-plugin] Set merge_method to squash#80906

Open
dsimansk wants to merge 1 commit into
openshift:mainfrom
dsimansk:pr/set-squash
Open

[faas-console-plugin] Set merge_method to squash#80906
dsimansk wants to merge 1 commit into
openshift:mainfrom
dsimansk:pr/set-squash

Conversation

@dsimansk

@dsimansk dsimansk commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

Per Slack thread conversation

/cc @matejvasek @Cragsmann

Summary by CodeRabbit

This PR updates the Prow CI/CD configuration for the openshift/faas-console-plugin repository to use squash merging strategy. When pull requests to this repository meet the approval requirements (labeled with approved and lgtm, and without blocking labels like do-not-merge/hold or needs-rebase), Prow's tide will now automatically merge them by squashing all commits into a single commit before merging to the target branch.

This is a configuration-only change that affects how the faas-console-plugin repository's CI automation handles pull request merges, aligning it with the merge strategy used by several other OpenShift repositories in the CI infrastructure.

@openshift-ci openshift-ci Bot requested review from Cragsmann and matejvasek June 23, 2026 11:18
@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: dsimansk

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 23, 2026
@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: 2fb04978-e5a0-4497-8e42-015e0a6db67b

📥 Commits

Reviewing files that changed from the base of the PR and between 93fe74e and 87a863b.

📒 Files selected for processing (1)
  • core-services/prow/02_config/openshift/faas-console-plugin/_prowconfig.yaml

Walkthrough

The Prow tide configuration for openshift/faas-console-plugin is updated to explicitly set merge_method: squash, overriding the default merge behavior for that repository.

Changes

Prow Tide Merge Method

Layer / File(s) Summary
Tide squash merge method override
core-services/prow/02_config/openshift/faas-console-plugin/_prowconfig.yaml
Adds merge_method: squash under the tide section for openshift/faas-console-plugin.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

🚥 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 directly matches the main change: setting the merge_method to squash for the faas-console-plugin repository.
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 Prow configuration file, not Ginkgo tests. Check for stable test names is not applicable to non-test code.
Test Structure And Quality ✅ Passed PR modifies only Prow YAML configuration (_prowconfig.yaml); contains no Ginkgo test code. Custom check for Ginkgo test quality is not applicable.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests are added in this PR. The change is only to a Prow configuration YAML file (merge_method for faas-console-plugin), so the MicroShift test compatibility check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR only modifies Prow configuration files (.yaml), not Ginkgo e2e test code. No It(), Describe(), Context(), or When() Ginkgo test constructs are added, so the SNO compatibility check does not...
Topology-Aware Scheduling Compatibility ✅ Passed The PR only modifies Prow CI merge configuration (setting merge_method to squash), not deployment manifests, operator code, or scheduling constraints. The topology-aware scheduling check is inappli...
Ote Binary Stdout Contract ✅ Passed PR only modifies YAML configuration files; check applies exclusively to source code stdout writes in binaries, which are absent from this configuration-only change.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR does not add any Ginkgo e2e tests; it only modifies Prow tide configuration. The check is not applicable.
No-Weak-Crypto ✅ Passed PR modifies only a Prow configuration YAML file with no cryptographic code, algorithms, or implementations; no weak crypto patterns, custom crypto, or insecure comparisons detected.
Container-Privileges ✅ Passed Check is not applicable to this PR. The PR modifies Prow CI configuration files (_prowconfig.yaml, _pluginconfig.yaml, OWNERS), which are not container/K8s manifests containing privileged security...
No-Sensitive-Data-In-Logs ✅ Passed The pull request adds only a Prow configuration file with standard CI/CD settings (merge method and merge queries). No sensitive data like passwords, tokens, API keys, PII, session IDs, hostnames,...

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

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@dsimansk: no rehearsable tests are affected by this change

Note: If this PR includes changes to step registry files (ci-operator/step-registry/) and you expected jobs to be found, try rebasing your PR onto the base branch. This helps pj-rehearse accurately detect changes when the base branch has moved forward.

@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

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

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. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant