Skip to content

ci(ticdc): avoid regular integration jobs on nextgen branches#4656

Merged
ti-chi-bot[bot] merged 1 commit into
PingCAP-QE:mainfrom
cfzjywxk:fix-ticdc-nextgen-presubmits-20260605
Jun 5, 2026
Merged

ci(ticdc): avoid regular integration jobs on nextgen branches#4656
ti-chi-bot[bot] merged 1 commit into
PingCAP-QE:mainfrom
cfzjywxk:fix-ticdc-nextgen-presubmits-20260605

Conversation

@cfzjywxk
Copy link
Copy Markdown
Contributor

@cfzjywxk cfzjywxk commented Jun 5, 2026

What changed

Remove ^release-nextgen-\d+$ from the regular TiCDC presubmit branch set in prow-jobs/pingcap/ticdc/latest-presubmits.yaml.

The next-gen presubmits in prow-jobs/pingcap/ticdc/latest-presubmits-next-gen.yaml still match release-nextgen-* branches.

Why

TiCDC PRs targeting release-nextgen-202603 currently trigger regular jobs such as pull-cdc-pulsar-integration-light when /test all is used. Those regular jobs download TiDB, PD, and TiKV artifacts from the normal hub OCI registry, but next-gen artifacts are handled by the *_next_gen pipelines through the tidbx registry.

This caused artifact lookup failures like:

us-docker.pkg.dev/pingcap-testing-account/hub/pingcap/tidb/package:release-nextgen-202603_linux_amd64: not found

Ref: pingcap/ticdc#5203

Verification

Parsed the Prow YAML locally and checked branch/trigger selection for release-nextgen-202603:

  • Before this change, /test all selected the regular TiCDC integration jobs.
  • After this change, /test all selects no regular TiCDC jobs on release-nextgen-202603.
  • /test next-gen still selects the *_next_gen TiCDC integration jobs.
  • /test pull-cdc-pulsar-integration-light-next-gen still selects pull_cdc_pulsar_integration_light_next_gen.
  • master, release-8.5, and feature/foo still select the regular /test all jobs.

Also ran git diff --check for the changed file.

Signed-off-by: cfzjywxk <cfzjywxk@gmail.com>
Copy link
Copy Markdown

@ti-chi-bot ti-chi-bot Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have already done a preliminary review for you, and I hope to help you do a better job.

Summary
This PR removes the release-nextgen-\d+ regex branch pattern from the regular TiCDC presubmit branch set in latest-presubmits.yaml. The change ensures that next-gen branches no longer trigger the regular integration jobs, which rely on artifacts from the standard OCI registry rather than the next-gen pipeline registry. The approach is a minimal change focused on branch pattern exclusion, and the author has verified the resulting branch/job mappings locally and ran syntax checks. Overall, the change is straightforward, with no apparent bugs or regressions.


Code Improvements

  • prow-jobs/pingcap/ticdc/latest-presubmits.yaml (line 5-6)
    Removing the release-nextgen-\d+ branch from the branch list is correct for avoiding regular jobs on next-gen branches. However, consider adding a comment near this list explaining why this branch is excluded, for future maintainers who may wonder about the omission:

    branches: &branches
      - ^master$
      # Exclude next-gen release branches to avoid triggering regular TiCDC integration jobs
      # which use incompatible artifact registries
      - ^release-8\.5(\.\d+)?(-\d+)?(-v[\.\d]+)?(-\d+)?$
      - ^feature/.+

    This small documentation would improve maintainability.


Best Practices

  • Testing Coverage
    The PR description mentions manual verification and a syntax check with prowgen. However, consider adding or updating automated tests for presubmit job matching on branches, if such tests exist in the repo, to catch regressions on branch/job mappings automatically.

  • Documentation
    The PR description and commit message are clear and detailed. However, adding a short note in the prow-jobs/pingcap/ticdc/latest-presubmits.yaml file itself about next-gen branch handling would improve discoverability of this special case by other engineers.


No critical issues or security concerns identified. The change is minimal and well-justified.

@pingcap-cla-assistant
Copy link
Copy Markdown

pingcap-cla-assistant Bot commented Jun 5, 2026

CLA assistant check
All committers have signed the CLA.

@ti-chi-bot ti-chi-bot Bot added the size/XS label Jun 5, 2026
@cfzjywxk
Copy link
Copy Markdown
Contributor Author

cfzjywxk commented Jun 5, 2026

@wuhuizuo @tenfyzhong
PTAL if this is the expected way for ticdc nextgen release-202603 branch

@cfzjywxk cfzjywxk changed the title ticdc: avoid regular integration jobs on nextgen branches ci(ticdc): avoid regular integration jobs on nextgen branches Jun 5, 2026
@ti-chi-bot ti-chi-bot Bot added the lgtm label Jun 5, 2026
@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot Bot commented Jun 5, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wuhuizuo

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

@ti-chi-bot ti-chi-bot Bot added the approved label Jun 5, 2026
@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot Bot commented Jun 5, 2026

[LGTM Timeline notifier]

Timeline:

  • 2026-06-05 08:34:02.701031809 +0000 UTC m=+516943.771349189: ☑️ agreed by wuhuizuo.

@ti-chi-bot ti-chi-bot Bot merged commit c9e0135 into PingCAP-QE:main Jun 5, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

2 participants