Prow Issue: Tide didn't merge PR with configuration we set

[Summer-Field]

What happened: We use tide to merge our PR with merge-type = squash. However, it still uses merge-type = merge to merge our PR from time to time. Here is the commit history. We cloud see that PR-51 merge with merge-type = merge, however, PR-45 merge with merge-type = squash. What you expected to happen: Tide merges our PR with the configuration we set. How to reproduce it (as minimally and precisely as possible): Config our tide with following configuration:

tide:
      merge_method:
        <org-name>/<repo-name>: squash

Please provide links to example occurrences, if any: https://github.com/kitex-contrib/test-infra/commits/main Anything else we need to know?: Here are 2 log files for the mentioned PR above:

• 2022.04.18_squash.txt
• 2022.04.19_merge.txt

And this is the log for the newest PR(51) merge with merge-method=merge

{"client":"git","commitlike":"8be3384340f9138e81c91d70673145e5ef5e642e","component":"tide","file":"prow/git/git.go:300","func":"k8s.io/test-infra/prow/git.(*Repo).Checkout","level":"info","msg":"Checkout.","severity":"info","time":"2022-04-26T07:56:18Z"}
{"baseSHA":"8be3384340f9138e81c91d70673145e5ef5e642e","client":"git","component":"tide","file":"prow/git/git.go:406","func":"k8s.io/test-infra/prow/git.(*Repo).MergeAndCheckout","headSHAs":["d55f907f4da7c5073e29aa5157e11ea4ccca9060"],"level":"info","msg":"Merging.","severity":"info","strategy":"squash","time":"2022-04-26T07:56:18Z"}
{"client":"git","commitlike":"d55f907f4da7c5073e29aa5157e11ea4ccca9060","component":"tide","file":"prow/git/git.go:345","func":"k8s.io/test-infra/prow/git.(*Repo).MergeWithStrategy","level":"info","msg":"Merging.","severity":"info","time":"2022-04-26T07:56:18Z"}
{"args":["gc.auto","0"],"client":"git","component":"tide","file":"prow/git/git.go:485","func":"k8s.io/test-infra/prow/git.(*Repo).Config","level":"info","msg":"Running git config.","severity":"info","time":"2022-04-26T07:56:34Z"}
{"args":["user.name","prow"],"client":"git","component":"tide","file":"prow/git/git.go:485","func":"k8s.io/test-infra/prow/git.(*Repo).Config","level":"info","msg":"Running git config.","severity":"info","time":"2022-04-26T07:56:34Z"}
{"client":"git","component":"tide","file":"prow/git/git.go:185","func":"k8s.io/test-infra/prow/git.(*Client).Clone","level":"info","msg":"Fetching.","repo":"kitex-contrib/test-infra","severity":"info","time":"2022-04-26T07:56:34Z"}
{"args":["user.email","prow@localhost"],"client":"git","component":"tide","file":"prow/git/git.go:485","func":"k8s.io/test-infra/prow/git.(*Repo).Config","level":"info","msg":"Running git config.","severity":"info","time":"2022-04-26T07:56:34Z"}
{"args":["commit.gpgsign","false"],"client":"git","component":"tide","file":"prow/git/git.go:485","func":"k8s.io/test-infra/prow/git.(*Repo).Config","level":"info","msg":"Running git config.","severity":"info","time":"2022-04-26T07:56:34Z"}
{"client":"git","commitlike":"8be3384340f9138e81c91d70673145e5ef5e642e","component":"tide","file":"prow/git/git.go:300","func":"k8s.io/test-infra/prow/git.(*Repo).Checkout","level":"info","msg":"Checkout.","severity":"info","time":"2022-04-26T07:56:34Z"}
{"baseSHA":"8be3384340f9138e81c91d70673145e5ef5e642e","client":"git","component":"tide","file":"prow/git/git.go:406","func":"k8s.io/test-infra/prow/git.(*Repo).MergeAndCheckout","headSHAs":["c1a4c61a72094518e684983437764cf1d39c84bb"],"level":"info","msg":"Merging.","severity":"info","strategy":"squash","time":"2022-04-26T07:56:34Z"}
{"client":"git","commitlike":"c1a4c61a72094518e684983437764cf1d39c84bb","component":"tide","file":"prow/git/git.go:345","func":"k8s.io/test-infra/prow/git.(*Repo).MergeWithStrategy","level":"info","msg":"Merging.","severity":"info","time":"2022-04-26T07:56:34Z"}
{"args":["gc.auto","0"],"client":"git","component":"tide","file":"prow/git/git.go:485","func":"k8s.io/test-infra/prow/git.(*Repo).Config","level":"info","msg":"Running git config.","severity":"info","time":"2022-04-26T07:57:14Z"}
{"args":["user.name","prow"],"client":"git","component":"tide","file":"prow/git/git.go:485","func":"k8s.io/test-infra/prow/git.(*Repo).Config","level":"info","msg":"Running git config.","severity":"info","time":"2022-04-26T07:57:14Z"}
{"args":["user.email","prow@localhost"],"client":"git","component":"tide","file":"prow/git/git.go:485","func":"k8s.io/test-infra/prow/git.(*Repo).Config","level":"info","msg":"Running git config.","severity":"info","time":"2022-04-26T07:57:14Z"}
{"client":"git","component":"tide","file":"prow/git/git.go:185","func":"k8s.io/test-infra/prow/git.(*Client).Clone","level":"info","msg":"Fetching.","repo":"kitex-contrib/test-infra","severity":"info","time":"2022-04-26T07:57:14Z"}
{"args":["commit.gpgsign","false"],"client":"git","component":"tide","file":"prow/git/git.go:485","func":"k8s.io/test-infra/prow/git.(*Repo).Config","level":"info","msg":"Running git config.","severity":"info","time":"2022-04-26T07:57:14Z"}
{"client":"git","commitlike":"8be3384340f9138e81c91d70673145e5ef5e642e","component":"tide","file":"prow/git/git.go:300","func":"k8s.io/test-infra/prow/git.(*Repo).Checkout","level":"info","msg":"Checkout.","severity":"info","time":"2022-04-26T07:57:14Z"}
{"baseSHA":"8be3384340f9138e81c91d70673145e5ef5e642e","client":"git","component":"tide","file":"prow/git/git.go:406","func":"k8s.io/test-infra/prow/git.(*Repo).MergeAndCheckout","headSHAs":["d55f907f4da7c5073e29aa5157e11ea4ccca9060"],"level":"info","msg":"Merging.","severity":"info","strategy":"squash","time":"2022-04-26T07:57:14Z"}
{"client":"git","commitlike":"d55f907f4da7c5073e29aa5157e11ea4ccca9060","component":"tide","file":"prow/git/git.go:345","func":"k8s.io/test-infra/prow/git.(*Repo).MergeWithStrategy","level":"info","msg":"Merging.","severity":"info","time":"2022-04-26T07:57:14Z"}
{"base-sha":"8be3384340f9138e81c91d70673145e5ef5e642e","branch":"main","component":"tide","controller":"sync","file":"prow/tide/tide.go:1630","func":"k8s.io/test-infra/prow/tide.(*Controller).syncSubpool","level":"info","msg":"Syncing subpool: 1 PRs, 0 PJs.","org":"kitex-contrib","repo":"test-infra","severity":"info","time":"2022-04-26T07:57:14Z"}
{"base-sha":"8be3384340f9138e81c91d70673145e5ef5e642e","batch-passing":null,"batch-pending":null,"branch":"main","component":"tide","controller":"sync","file":"prow/tide/tide.go:1639","func":"k8s.io/test-infra/prow/tide.(*Controller).syncSubpool","level":"info","msg":"Subpool accumulated.","org":"kitex-contrib","prs-missing":null,"prs-passing":[51],"prs-pending":null,"repo":"test-infra","severity":"info","time":"2022-04-26T07:57:14Z"}
{"client":"github","component":"tide","controller":"sync","file":"prow/github/client.go:889","func":"k8s.io/test-infra/prow/github.(*client).log","level":"info","msg":"CreateStatus(kitex-contrib, test-infra, d55f907f4da7c5073e29aa5157e11ea4ccca9060, {success http://prow.bytedanceoss.net/tide  tide})","severity":"info","time":"2022-04-26T07:57:14Z"}
{"client":"github","component":"tide","controller":"sync","file":"prow/github/client.go:889","func":"k8s.io/test-infra/prow/github.(*client).log","level":"info","msg":"Merge(kitex-contrib, test-infra, 51, {  d55f907f4da7c5073e29aa5157e11ea4ccca9060 squash})","severity":"info","time":"2022-04-26T07:57:15Z"}
{"action":"MERGE","base-sha":"8be3384340f9138e81c91d70673145e5ef5e642e","branch":"main","component":"tide","controller":"sync","file":"prow/tide/tide.go:1668","func":"k8s.io/test-infra/prow/tide.(*Controller).syncSubpool","level":"info","msg":"Subpool synced.","org":"kitex-contrib","repo":"test-infra","severity":"info","targets":[51],"time":"2022-04-26T07:57:16Z"}
{"component":"tide","controller":"sync","duration":"6m16.704667804s","file":"prow/tide/tide.go:356","func":"k8s.io/test-infra/prow/tide.(*Controller).Sync.func1","level":"info","msg":"Synced","severity":"info","time":"2022-04-26T07:57:16Z"}
{"component":"tide","controller":"sync","duration":"581.518251ms","file":"prow/tide/tide.go:356","func":"k8s.io/test-infra/prow/tide.(*Controller).Sync.func1","level":"info","msg":"Synced","severity":"info","time":"2022-04-26T07:57:16Z"}
{"component":"tide","controller":"sync","duration":"479.488538ms","file":"prow/tide/tide.go:356","func":"k8s.io/test-infra/prow/tide.(*Controller).Sync.func1","level":"info","msg":"Synced","severity":"info","time":"2022-04-26T07:58:16Z"}
{"component":"tide","controller":"sync","duration":"482.116243ms","file":"prow/tide/tide.go:356","func":"k8s.io/test-infra/prow/tide.(*Controller).Sync.func1","level":"info","msg":"Synced","severity":"info","time":"2022-04-26T07:59:16Z"}
{"args":["gc.auto","0"],"client":"git","component":"tide","file":"prow/git/git.go:485","func":"k8s.io/test-infra/prow/git.(*Repo).Config","level":"info","msg":"Running git config.","severity":"info","time":"2022-04-26T07:59:48Z"}
{"args":["user.name","prow"],"client":"git","component":"tide","file":"prow/git/git.go:485","func":"k8s.io/test-infra/prow/git.(*Repo).Config","level":"info","msg":"Running git config.","severity":"info","time":"2022-04-26T07:59:48Z"}
{"args":["user.email","prow@localhost"],"client":"git","component":"tide","file":"prow/git/git.go:485","func":"k8s.io/test-infra/prow/git.(*Repo).Config","level":"info","msg":"Running git config.","severity":"info","time":"2022-04-26T07:59:48Z"}
{"args":["commit.gpgsign","false"],"client":"git","component":"tide","file":"prow/git/git.go:485","func":"k8s.io/test-infra/prow/git.(*Repo).Config","level":"info","msg":"Running git config.","severity":"info","time":"2022-04-26T07:59:48Z"}
{"client":"git","commitlike":"8be3384340f9138e81c91d70673145e5ef5e642e","component":"tide","file":"prow/git/git.go:300","func":"k8s.io/test-infra/prow/git.(*Repo).Checkout","level":"info","msg":"Checkout.","severity":"info","time":"2022-04-26T07:59:48Z"}
{"baseSHA":"8be3384340f9138e81c91d70673145e5ef5e642e","client":"git","component":"tide","file":"prow/git/git.go:406","func":"k8s.io/test-infra/prow/git.(*Repo).MergeAndCheckout","headSHAs":["d55f907f4da7c5073e29aa5157e11ea4ccca9060"],"level":"info","msg":"Merging.","severity":"info","strategy":"squash","time":"2022-04-26T07:59:48Z"}
{"client":"git","commitlike":"d55f907f4da7c5073e29aa5157e11ea4ccca9060","component":"tide","file":"prow/git/git.go:345","func":"k8s.io/test-infra/prow/git.(*Repo).MergeWithStrategy","level":"info","msg":"Merging.","severity":"info","time":"2022-04-26T07:59:48Z"}
{"component":"tide","controller":"status-update","duration":"8m13.697275345s","file":"prow/tide/status.go:581","func":"k8s.io/test-infra/prow/tide.(*statusController).sync.func1","level":"info","msg":"Statuses synced.","severity":"info","time":"2022-04-26T07:59:48Z"}
{"component":"tide","controller":"status-update","duration":"1.354501365s","file":"prow/tide/status.go:581","func":"k8s.io/test-infra/prow/tide.(*statusController).sync.func1","level":"info","msg":"Statuses synced.","severity":"info","time":"2022-04-26T07:59:49Z"}
{"component":"tide","controller":"sync","duration":"596.712826ms","file":"prow/tide/tide.go:356","func":"k8s.io/test-infra/prow/tide.(*Controller).Sync.func1","level":"info","msg":"Synced","severity":"info","time":"2022-04-26T08:00:16Z"}
{"component":"tide","controller":"status-update","duration":"466.783205ms","file":"prow/tide/status.go:581","func":"k8s.io/test-infra/prow/tide.(*statusController).sync.func1","level":"info","msg":"Statuses synced.","severity":"info","time":"2022-04-26T08:00:48Z"}
{"component":"tide","controller":"sync","duration":"487.555232ms","file":"prow/tide/tide.go:356","func":"k8s.io/test-infra/prow/tide.(*Controller).Sync.func1","level":"info","msg":"Synced","severity":"info","time":"2022-04-26T08:01:16Z"}

[Summer-Field]

/sig testing

[Summer-Field]

/cc @Jeffwan

[Summer-Field]

/area prow

[k8s-triage-robot]

The Kubernetes project currently lacks enough contributors to adequately respond to all issues and PRs.

This bot triages issues and PRs according to the following rules:

• After 90d of inactivity, lifecycle/stale is applied
• After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
• After 30d of inactivity since lifecycle/rotten was applied, the issue is closed

You can:

• Mark this issue or PR as fresh with /remove-lifecycle stale
• Mark this issue or PR as rotten with /lifecycle rotten
• Close this issue or PR with /close
• Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle stale

[k8s-triage-robot]

The Kubernetes project currently lacks enough active contributors to adequately respond to all issues and PRs.

This bot triages issues and PRs according to the following rules:

• After 90d of inactivity, lifecycle/stale is applied
• After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
• After 30d of inactivity since lifecycle/rotten was applied, the issue is closed

You can:

• Mark this issue or PR as fresh with /remove-lifecycle rotten
• Close this issue or PR with /close
• Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle rotten

[k8s-triage-robot]

The Kubernetes project currently lacks enough active contributors to adequately respond to all issues and PRs.

This bot triages issues according to the following rules:

• After 90d of inactivity, lifecycle/stale is applied
• After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
• After 30d of inactivity since lifecycle/rotten was applied, the issue is closed

You can:

• Reopen this issue with /reopen
• Mark this issue as fresh with /remove-lifecycle rotten
• Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/close not-planned

[k8s-ci-robot]

@k8s-triage-robot: Closing this issue, marking it as "Not Planned".

In response to this:

The Kubernetes project currently lacks enough active contributors to adequately respond to all issues and PRs.

This bot triages issues according to the following rules:

• After 90d of inactivity, lifecycle/stale is applied
• After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
• After 30d of inactivity since lifecycle/rotten was applied, the issue is closed

You can:

• Reopen this issue with /reopen
• Mark this issue as fresh with /remove-lifecycle rotten
• Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/close not-planned

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/test-infra repository.