diff --git a/tests/docker/cluster.yaml b/tests/docker/cluster.yaml index dd2f1dbf33f..e9037f6f776 100644 --- a/tests/docker/cluster.yaml +++ b/tests/docker/cluster.yaml @@ -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: @@ -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: @@ -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: diff --git a/tests/docker/cluster_disable_new_collation.yaml b/tests/docker/cluster_disable_new_collation.yaml index 8dd13e2c0a8..c146ad1b66c 100644 --- a/tests/docker/cluster_disable_new_collation.yaml +++ b/tests/docker/cluster_disable_new_collation.yaml @@ -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: @@ -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: @@ -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: diff --git a/tests/docker/cluster_new_collation.yaml b/tests/docker/cluster_new_collation.yaml index 153b40f327b..3e4f4af6a2e 100644 --- a/tests/docker/cluster_new_collation.yaml +++ b/tests/docker/cluster_new_collation.yaml @@ -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: @@ -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: @@ -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: diff --git a/tests/docker/cluster_tidb_fail_point.yaml b/tests/docker/cluster_tidb_fail_point.yaml index faec3c48898..2a0a9fb7dcc 100644 --- a/tests/docker/cluster_tidb_fail_point.yaml +++ b/tests/docker/cluster_tidb_fail_point.yaml @@ -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: @@ -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: @@ -55,7 +55,7 @@ services: - "pd0" restart: on-failure tidb0: - image: hub.pingcap.net/qa/tidb:${TIDB_BRANCH:-master}-failpoint + image: us-docker.pkg.dev/pingcap-testing-account/hub/pingcap/tidb/images/tidb-server:${TIDB_BRANCH:-master}-failpoint security_opt: - seccomp:unconfined environment: diff --git a/tests/docker/run.sh b/tests/docker/run.sh index 9730cdb7c3b..c92c57883ce 100755 --- a/tests/docker/run.sh +++ b/tests/docker/run.sh @@ -71,6 +71,10 @@ 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//\//-}" +export TAG="${TAG//\//-}" # Stop all docker instances if exist. diff --git a/tests/docker/tiflash-tagged-image.yaml b/tests/docker/tiflash-tagged-image.yaml index 893162c69c3..1c2bf758c8d 100644 --- a/tests/docker/tiflash-tagged-image.yaml +++ b/tests/docker/tiflash-tagged-image.yaml @@ -18,7 +18,7 @@ services: # for tests under fullstack-test directory # (engine DeltaTree) tiflash0: - image: hub.pingcap.net/tiflash/tics:${TAG:-master} + image: us-docker.pkg.dev/pingcap-testing-account/hub/pingcap/tiflash/image:${TAG:-master} security_opt: - seccomp:unconfined volumes: @@ -36,4 +36,3 @@ services: depends_on: - "pd0" - "tikv0" - diff --git a/tests/docker/util.sh b/tests/docker/util.sh index cb050a8cda3..c8c77fdb1b3 100644 --- a/tests/docker/util.sh +++ b/tests/docker/util.sh @@ -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" }