Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ti-chi-bot merged 2 commits into from
Apr 8, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e81d449
tests: support overriding HUB_ADDR/PD_IMAGE/TIKV_IMAGE/TIDB_IMAGE via…
JaySon-Huang Apr 8, 2026
fa47223
Fix image uri
JaySon-Huang Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tests/docker/next-gen-utils/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
# limitations under the License.

DOCKER ?= docker
TIKV_IMAGE ?= us-docker.pkg.dev/pingcap-testing-account/hub/tikv/tikv/image:dedicated-next-gen
PD_IMAGE ?= us-docker.pkg.dev/pingcap-testing-account/hub/tikv/pd/image:master-next-gen
TIDB_IMAGE ?= us-docker.pkg.dev/pingcap-testing-account/hub/pingcap/tidb/images/tidb-server:master-next-gen
TIFLASH_IMAGE ?= us-docker.pkg.dev/pingcap-testing-account/hub/pingcap/tiflash/image:master-next-gen
TIKV_IMAGE ?= us-docker.pkg.dev/pingcap-testing-account/tidbx/tikv/tikv/image:cloud-engine-next-gen
PD_IMAGE ?= us-docker.pkg.dev/pingcap-testing-account/tidbx/tikv/pd/image:master-next-gen
TIDB_IMAGE ?= us-docker.pkg.dev/pingcap-testing-account/tidbx/pingcap/tidb/images/tidb-server:master-next-gen
TIFLASH_IMAGE ?= us-docker.pkg.dev/pingcap-testing-account/tidbx/pingcap/tiflash/image:master-next-gen

# Set PULL to 1 to always pull the latest image
PULL ?= 0
Expand Down
8 changes: 4 additions & 4 deletions tests/docker/next-gen-yaml/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
# Use entrypoint instead, create bucket "tiflash-test" on minio at startup
entrypoint: sh -c 'mkdir -p /data/tiflash-test && minio server /data --console-address ":9001" > /log/minio.log 2>&1'
pd0:
image: ${PD_IMAGE:-us-docker.pkg.dev/pingcap-testing-account/hub/tikv/pd/image:master-next-gen}
image: ${PD_IMAGE:-us-docker.pkg.dev/pingcap-testing-account/tidbx/tikv/pd/image:master-next-gen}
security_opt:
- seccomp:unconfined
volumes:
Expand All @@ -37,7 +37,7 @@ services:
command: --name=pd0 --client-urls=http://0.0.0.0:2379 --peer-urls=http://0.0.0.0:2380 --advertise-client-urls=http://pd0:2379 --advertise-peer-urls=http://pd0:2380 --initial-cluster=pd0=http://pd0:2380 --config=/pd.toml --data-dir=/data --log-file=/log/pd.log
restart: on-failure
tikv0:
image: ${TIKV_IMAGE:-us-docker.pkg.dev/pingcap-testing-account/hub/tikv/tikv/image:dedicated-next-gen}
image: ${TIKV_IMAGE:-us-docker.pkg.dev/pingcap-testing-account/tidbx/tikv/tikv/image:cloud-engine-next-gen}
security_opt:
- seccomp:unconfined
volumes:
Expand All @@ -50,7 +50,7 @@ services:
- "minio0"
restart: on-failure
tikv-worker0:
image: ${TIKV_IMAGE:-us-docker.pkg.dev/pingcap-testing-account/hub/tikv/tikv/image:dedicated-next-gen}
image: ${TIKV_IMAGE:-us-docker.pkg.dev/pingcap-testing-account/tidbx/tikv/tikv/image:cloud-engine-next-gen}
security_opt:
- seccomp:unconfined
volumes:
Expand All @@ -63,7 +63,7 @@ services:
- "pd0"
restart: on-failure
tidb0:
image: ${TIDB_IMAGE:-us-docker.pkg.dev/pingcap-testing-account/hub/pingcap/tidb/images/tidb-server:master-next-gen}
image: ${TIDB_IMAGE:-us-docker.pkg.dev/pingcap-testing-account/tidbx/pingcap/tidb/images/tidb-server:master-next-gen}
security_opt:
- seccomp:unconfined
volumes:
Expand Down
12 changes: 6 additions & 6 deletions tests/fullstack-test-next-gen/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ if [[ -n "$ENABLE_NEXT_GEN" && "$ENABLE_NEXT_GEN" != "false" && "$ENABLE_NEXT_GE
echo "Running fullstack test on next-gen TiFlash"

# set images for next-gen TiFlash cluster
HUB_ADDR="us-docker.pkg.dev/pingcap-testing-account/hub"
HUB_ADDR="${HUB_ADDR:-us-docker.pkg.dev/pingcap-testing-account/tidbx}"
if [[ -z "${PD_BRANCH}" || "${PD_BRANCH}" == "master" ]]; then
PD_BRANCH="master-next-gen"
fi
if [[ -z "${TIKV_BRANCH}" || "${TIKV_BRANCH}" == "dedicated" ]]; then
TIKV_BRANCH="dedicated-next-gen"
if [[ -z "${TIKV_BRANCH}" || "${TIKV_BRANCH}" == "cloud-engine" ]]; then
TIKV_BRANCH="cloud-engine-next-gen"
fi
if [[ -z "${TIDB_BRANCH}" || "${TIDB_BRANCH}" == "master" ]]; then
TIDB_BRANCH="master-next-gen"
fi
export PD_IMAGE="${HUB_ADDR}/tikv/pd/image:${PD_BRANCH}"
export TIKV_IMAGE="${HUB_ADDR}/tikv/tikv/image:${TIKV_BRANCH}"
export TIDB_IMAGE="${HUB_ADDR}/pingcap/tidb/images/tidb-server:${TIDB_BRANCH}"
export PD_IMAGE="${PD_IMAGE:-${HUB_ADDR}/tikv/pd/image:${PD_BRANCH}}"
export TIKV_IMAGE="${TIKV_IMAGE:-${HUB_ADDR}/tikv/tikv/image:${TIKV_BRANCH}}"
export TIDB_IMAGE="${TIDB_IMAGE:-${HUB_ADDR}/pingcap/tidb/images/tidb-server:${TIDB_BRANCH}}"

# clean up previous docker instances, data and log
${COMPOSE} -f next-gen-cluster.yaml -f "${DISAGG_TIFLASH_YAML}" down
Expand Down