Started by GitHub push by ti-chi-bot[bot]Started by GitHub push by ti-chi-bot[bot]00217342173448009480091.008517851718685eb09603ade83a487a84556f31b2c9bccde9af1d5eb09603ade83a487a84556f31b2c9bccde9af1dorigin/main5eb09603ade83a487a84556f31b2c9bccde9af1d5eb09603ade83a487a84556f31b2c9bccde9af1dorigin/main5eb09603ade83a487a84556f31b2c9bccde9af1d5eb09603ade83a487a84556f31b2c9bccde9af1dorigin/mainhttps://github.com/PingCAP-QE/ci.gitfalse#18684800939542seed #18681868falsefalse18683694595SUCCESS1783375743083https://do.pingcap.net/jenkins/job/seed/1868/default-r6g77tekton/v1/triggers/triggers/env-gcp/kustomization.yamltekton/v1/triggers/triggers/env-gcp/_/github-pr-synchronized-remove-hold.yaml5eb09603ade83a487a84556f31b2c9bccde9af1d1783375709000https://do.pingcap.net/jenkins/user/noreplynoreplynoreply@github.comfeat(tekton): add trigger to auto-remove do-not-merge/hold on cherry-pick PRs (#4810) ## Summary Add a new Tekton Trigger that auto-removes `do-not-merge/hold` from cherry-pick PRs when conflicts are resolved (synchronize event). ## Changes 1. **NEW** `tekton/v1/triggers/triggers/env-gcp/_/github-pr-synchronized-remove-hold.yaml` — Trigger with CEL filter and inline TaskSpec that: - Filters on `synchronize` action for 6 cherry-pick repos with `release-*` base ref and `do-not-merge/hold` + `type/cherry-pick-for-release-*` labels - Polls `mergeable` state (up to 10 × 5s) — exits silently if still CONFLICTING/UNKNOWN - Checks `do-not-merge/hold` was added by `ti-chi-bot` or `ti-chi-bot[bot]` via timeline API — human `/hold` is respected - Posts a tip comment then removes the label 2. **MODIFIED** `tekton/v1/triggers/triggers/env-gcp/kustomization.yaml` — registered the new trigger ## Testing - `kustomize build tekton/v1/triggers/triggers/env-gcp` succeeds (verified via docker) - `gh pr view` with `--json mergeable` polling handles GitHubs async mergeable computation - Cherry-pick repo set verified against `ti-community-cherrypicker` config in `ti-community-infra/configs` ## Risk Low. Purely additive — no changes to existing triggers. Removes label only when all gates pass. Fails closed (keeps hold) on CONFLICTING/UNKNOWN or non-bot labeler. ## Open Items - Requirement #2 "tip before adding" — the add path is in prow config (`ti-community-infra/configs`), not this repo. Out of scope for this PR; separate ticket needed if still wanted. --------- Signed-off-by: wuhuizuo <wuhuizuo@126.com> 2026-07-06 22:08:29 +00005eb09603ade83a487a84556f31b2c9bccde9af1dfeat(tekton): add trigger to auto-remove do-not-merge/hold onaddtekton/v1/triggers/triggers/env-gcp/_/github-pr-synchronized-remove-hold.yamledittekton/v1/triggers/triggers/env-gcp/kustomization.yamlgithttps://do.pingcap.net/jenkins/user/noreplynoreply