Skip to content

tests: support overriding HUB_ADDR/PD_IMAGE/TIKV_IMAGE/TIDB_IMAGE via env vars in next-gen fullstack test#10791

Merged
ti-chi-bot[bot] merged 2 commits intopingcap:masterfrom
JaySon-Huang:fix_ng_image
Apr 8, 2026
Merged

tests: support overriding HUB_ADDR/PD_IMAGE/TIKV_IMAGE/TIDB_IMAGE via env vars in next-gen fullstack test#10791
ti-chi-bot[bot] merged 2 commits intopingcap:masterfrom
JaySon-Huang:fix_ng_image

Conversation

@JaySon-Huang
Copy link
Copy Markdown
Contributor

@JaySon-Huang JaySon-Huang commented Apr 8, 2026

What problem does this PR solve?

Issue Number: ref #6233

Problem Summary:

What is changed and how it works?

tests: support overriding HUB_ADDR/PD_IMAGE/TIKV_IMAGE/TIDB_IMAGE via env vars in next-gen fullstack test

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

Summary by CodeRabbit

  • Chores
    • Made Docker registry override optional, using a default only when unset.
    • Changed default branch/tag selection for TiKV used by tests.
    • Updated default image references/tags for TiKV, PD, TiDB, and TiFlash to new registry defaults.
    • Preserve any preexisting PD/TiKV/TiDB image environment variables instead of always overwriting them.

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. labels Apr 8, 2026
@pantheon-ai
Copy link
Copy Markdown

pantheon-ai bot commented Apr 8, 2026

Review Complete

Findings: 0 issues
Posted: 0
Duplicates/Skipped: 0

ℹ️ Learn more details on Pantheon AI.

@ti-chi-bot ti-chi-bot bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 8, 2026
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 8, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 027f8e8f-7f7b-4abd-aa5f-58826cbb78a2

📥 Commits

Reviewing files that changed from the base of the PR and between e81d449 and fa47223.

📒 Files selected for processing (1)
  • tests/docker/next-gen-yaml/cluster.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
  • tests/docker/next-gen-yaml/cluster.yaml

📝 Walkthrough

Walkthrough

Registry base defaulting now only applies when HUB_ADDR is unset; TIKV_BRANCH default for next-gen paths changed to cloud-engine-next-gen; exported image vars preserve preexisting PD_IMAGE/TIKV_IMAGE/TIDB_IMAGE; several default image paths/tags updated from .../hub/... to .../tidbx/....

Changes

Cohort / File(s) Summary
Next-gen test runner
tests/fullstack-test-next-gen/run.sh
HUB_ADDR is now optional (defaults to us-docker.pkg.dev/pingcap-testing-account/tidbx only if unset); TIKV_BRANCH default switched to cloud-engine-next-gen for next-gen; PD_IMAGE/TIKV_IMAGE/TIDB_IMAGE export use ${VAR:-computed} to preserve existing values.
Next-gen Docker Makefile
tests/docker/next-gen-utils/Makefile
Default image variables updated to tidbx repository paths; TIKV_IMAGE tag changed to cloud-engine-next-gen; PD_IMAGE/TIDB_IMAGE/TIFLASH_IMAGE point to master-next-gen under tidbx.
Next-gen Docker Compose
tests/docker/next-gen-yaml/cluster.yaml
Service image fallbacks updated to reference new tidbx image paths and the cloud-engine-next-gen / master-next-gen tags via ${VAR:-...} fallbacks.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Poem

🐇 I hop through scripts with tidy cheer,
HUB rests silent unless it's not near,
Tikv now clouds its branch to engine's tune,
Images stay yours if you set them soon,
Small hops, same tests — I nibble a rune. 🥕

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Title check ✅ Passed The title directly describes the main change: adding support for overriding HUB_ADDR and image variables via environment variables in next-gen fullstack tests.
Description check ✅ Passed The description follows the template structure with commit message and all required sections, though the problem summary is minimal and no tests are marked.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

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

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

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@JaySon-Huang
Copy link
Copy Markdown
Contributor Author

/hold

@ti-chi-bot ti-chi-bot bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed do-not-merge/needs-linked-issue labels Apr 8, 2026
Copy link
Copy Markdown

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

🧹 Nitpick comments (1)
tests/fullstack-test-next-gen/run.sh (1)

46-46: Consider mapping master for TIKV_BRANCH as well for consistency.

At Line 46, only empty/dedicated is remapped. Since set_branch() (in tests/docker/util.sh, Lines 121-130) can set TIKV_BRANCH from BRANCH, a BRANCH=master path can leave TiKV on :master while PD/TiDB are mapped to next-gen branches.

Proposed adjustment
-    if [[ -z "${TIKV_BRANCH}" || "${TIKV_BRANCH}" == "dedicated" ]]; then
+    if [[ -z "${TIKV_BRANCH}" || "${TIKV_BRANCH}" == "dedicated" || "${TIKV_BRANCH}" == "master" ]]; then
         TIKV_BRANCH="cloud-engine-next-gen"
     fi
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@tests/fullstack-test-next-gen/run.sh` at line 46, The TIKV_BRANCH assignment
only remaps empty/`dedicated` but misses handling `master`, so when set_branch()
sets BRANCH=master TiKV can remain on `:master` while PD/TiDB use next-gen;
update the logic that sets TIKV_BRANCH (the TIKV_BRANCH="cloud-engine-next-gen"
assignment) to also map BRANCH=="master" to "cloud-engine-next-gen" (mirror the
existing mapping for empty/dedicated) so TIKV_BRANCH is consistent with PD/TiDB
when BRANCH is master.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Nitpick comments:
In `@tests/fullstack-test-next-gen/run.sh`:
- Line 46: The TIKV_BRANCH assignment only remaps empty/`dedicated` but misses
handling `master`, so when set_branch() sets BRANCH=master TiKV can remain on
`:master` while PD/TiDB use next-gen; update the logic that sets TIKV_BRANCH
(the TIKV_BRANCH="cloud-engine-next-gen" assignment) to also map
BRANCH=="master" to "cloud-engine-next-gen" (mirror the existing mapping for
empty/dedicated) so TIKV_BRANCH is consistent with PD/TiDB when BRANCH is
master.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 4abfcf93-8153-424f-a163-541d3e3648c4

📥 Commits

Reviewing files that changed from the base of the PR and between a901005 and b3a35cf.

📒 Files selected for processing (1)
  • tests/fullstack-test-next-gen/run.sh

@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot bot commented Apr 8, 2026

@wuhuizuo: adding LGTM is restricted to approvers and reviewers in OWNERS files.

Details

In response to this:

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.

Copy link
Copy Markdown

@pantheon-ai pantheon-ai bot left a comment

Choose a reason for hiding this comment

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

✅ Code looks good. No issues found.

Copy link
Copy Markdown

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@tests/fullstack-test-next-gen/run.sh`:
- Around line 45-46: The branch rename is incomplete: replace all occurrences of
the old tag string "dedicated-next-gen" with "cloud-engine-next-gen" in the test
infra files (the Makefile used for next-gen Docker builds and the cluster.yaml
Docker Compose config) so both the Makefile and cluster.yaml reference
"cloud-engine-next-gen" consistently; search for the exact token
"dedicated-next-gen" and update it to "cloud-engine-next-gen" and verify the
CI/test run uses the new variable TIKV_BRANCH value.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 62e90179-2000-4cb1-9f15-6fa00a882065

📥 Commits

Reviewing files that changed from the base of the PR and between b3a35cf and 971bcb9.

📒 Files selected for processing (1)
  • tests/fullstack-test-next-gen/run.sh

Copy link
Copy Markdown

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@tests/fullstack-test-next-gen/run.sh`:
- Line 41: Update the fallback image defaults in cluster.yaml to match the new
HUB_ADDR namespace by replacing occurrences of the old
"us-docker.pkg.dev/pingcap-testing-account/hub/..." with
"us-docker.pkg.dev/pingcap-testing-account/tidbx/..." for the PD_IMAGE,
TIKV_IMAGE and TIDB_IMAGE fallbacks so that PD_IMAGE, TIKV_IMAGE and TIDB_IMAGE
use the tidbx namespace when run.sh is not sourced.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: dadd96f3-4ccc-4eaa-a018-ab11d9aa7c21

📥 Commits

Reviewing files that changed from the base of the PR and between 971bcb9 and e81d449.

📒 Files selected for processing (3)
  • tests/docker/next-gen-utils/Makefile
  • tests/docker/next-gen-yaml/cluster.yaml
  • tests/fullstack-test-next-gen/run.sh
✅ Files skipped from review due to trivial changes (1)
  • tests/docker/next-gen-yaml/cluster.yaml

@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot bot commented Apr 8, 2026

@JaySon-Huang: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-sanitizer-tsan e81d449 link false /test pull-sanitizer-tsan

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.

@wuhuizuo
Copy link
Copy Markdown
Contributor

wuhuizuo commented Apr 8, 2026

/retest

Signed-off-by: JaySon-Huang <tshent@qq.com>
@JaySon-Huang
Copy link
Copy Markdown
Contributor Author

/unhold

@ti-chi-bot ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 8, 2026
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Apr 8, 2026
@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot bot commented Apr 8, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CalvinNeo, JinheLin, 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 lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Apr 8, 2026
@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot bot commented Apr 8, 2026

[LGTM Timeline notifier]

Timeline:

  • 2026-04-08 09:47:27.059383941 +0000 UTC m=+949652.264743988: ☑️ agreed by JinheLin.
  • 2026-04-08 11:06:30.089971178 +0000 UTC m=+954395.295331225: ☑️ agreed by CalvinNeo.

@ti-chi-bot ti-chi-bot bot merged commit 00194f8 into pingcap:master Apr 8, 2026
9 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved lgtm release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants