Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
6 changes: 3 additions & 3 deletions tests/docker/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ version: '2.3'

services:
pd0:
image: hub.pingcap.net/qa/pd:${PD_BRANCH:-master}
image: us-docker.pkg.dev/pingcap-testing-account/hub/tikv/pd/image:${PD_BRANCH:-master}
security_opt:
- seccomp:unconfined
volumes:
Expand All @@ -35,7 +35,7 @@ services:
- --log-file=/log/pd.log
restart: on-failure
tikv0:
image: hub.pingcap.net/qa/tikv:${TIKV_BRANCH:-master}
image: us-docker.pkg.dev/pingcap-testing-account/hub/tikv/tikv/image:${TIKV_BRANCH:-master}
security_opt:
- seccomp:unconfined
volumes:
Expand All @@ -55,7 +55,7 @@ services:
- "pd0"
restart: on-failure
tidb0:
image: hub.pingcap.net/qa/tidb:${TIDB_BRANCH:-master}
image: us-docker.pkg.dev/pingcap-testing-account/hub/pingcap/tidb/images/tidb-server:${TIDB_BRANCH:-master}
security_opt:
- seccomp:unconfined
volumes:
Expand Down
3 changes: 3 additions & 0 deletions tests/docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ if [ -n "$BRANCH" ]; then
[ -z "$TIKV_BRANCH" ] && export TIKV_BRANCH="$BRANCH"
[ -z "$TIDB_BRANCH" ] && export TIDB_BRANCH="$BRANCH"
fi
export PD_BRANCH="${PD_BRANCH//\//-}"
export TIKV_BRANCH="${TIKV_BRANCH//\//-}"
export TIDB_BRANCH="${TIDB_BRANCH//\//-}"


# Stop all docker instances if exist.
Expand Down
3 changes: 3 additions & 0 deletions tests/docker/util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ function set_branch() {
[ -z "$TIKV_BRANCH" ] && export TIKV_BRANCH="$BRANCH"
[ -z "$TIDB_BRANCH" ] && export TIDB_BRANCH="$BRANCH"
fi
export PD_BRANCH="${PD_BRANCH//\//-}"
export TIKV_BRANCH="${TIKV_BRANCH//\//-}"
export TIDB_BRANCH="${TIDB_BRANCH//\//-}"
echo "use branch \`${BRANCH-master}\` for ci test"
}

Expand Down