Skip to content

feat: expose merge_commit_template to gitops scheduler#1070

Open
Skisocks wants to merge 2 commits intojenkins-x-plugins:mainfrom
spring-financial-group:feat/merge-commit-template
Open

feat: expose merge_commit_template to gitops scheduler#1070
Skisocks wants to merge 2 commits intojenkins-x-plugins:mainfrom
spring-financial-group:feat/merge-commit-template

Conversation

@Skisocks
Copy link
Copy Markdown
Member

@Skisocks Skisocks commented Apr 29, 2026

Changes

  • Expose merge_commit_template to scheduler config so github default can be overriden
  • Regen docs (picked up some dangling changes)
    • sheduler changes (this PR)
    • pusher-wave -> wave
    • --release-notes-file

Context

We use the merge_method: squash for all our repositories. This work fine aside from github incorrectly inferring a link to the wrong PR in our cluster repos.

  1. PR in app repo is squashed with default github message:
    deps: update service docker tag to v1.0.0 (#535)
  2. This ends up in the release notes of the app:
Chores
    deps: update service docker tag to v1.0.0 (#535) (some-bot)
  1. Which then end up in the PR description when this app is promoted to our cluster repo:
Chores
    deps: update service docker tag to v1.0.0 (#535) (some-bot)

Problem is the #535 in the context of the cluster repo actually points to PR 535 in the cluster repo rather than the app repo.

We'd like to overwrite the default merge commit message at the scheduler level so that the references are correct e.g.:

Chores
    deps: update service docker tag to v1.0.0 (some-org/some-repo#535) (some-bot)

@jenkins-x-bot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please assign skisocks
You can assign the PR to them by writing /assign @skisocks in a comment when ready.

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

@Skisocks Skisocks marked this pull request as ready for review April 29, 2026 18:55
@Skisocks
Copy link
Copy Markdown
Member Author

/cc @msvticket

@jenkins-x-bot jenkins-x-bot requested a review from msvticket April 29, 2026 18:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants