Skip to content

Commit 712069b

Browse files
authored
Update CI docker configs (#312)
1 parent dc99ed9 commit 712069b

File tree

5 files changed

+8
-222
lines changed

5 files changed

+8
-222
lines changed

Diff for: tests/docker/config/tiflash-cluster-manager.xml

-193
This file was deleted.

Diff for: tests/docker/config/tiflash.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</raft>
2525

2626
<flash>
27-
<service_addr>0.0.0.0:3930</service_addr>
27+
<service_addr>tiflash0:3930</service_addr>
2828
<flash_cluster>
2929
<master_ttl>60</master_ttl>
3030
<refresh_interval>20</refresh_interval>

Diff for: tests/docker/config/tikv-learner.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
[server]
1414
labels = { "engine" = "tiflash", "tiflash_http_port" = "8123" }
15-
engine-addr = "tiflash-gateway0:3930"
15+
engine-addr = "tiflash0:3930"
1616

1717
[storage]
1818

Diff for: tests/docker/docker-compose.yaml

+3-24
Original file line numberDiff line numberDiff line change
@@ -105,27 +105,6 @@ services:
105105
- --config-file
106106
- /config.xml
107107
restart: on-failure
108-
tiflash-gateway0:
109-
image: tecnativa/tcp-proxy
110-
environment:
111-
LISTEN:
112-
:3930
113-
:9000
114-
:8123
115-
:9009
116-
TALK:
117-
${TIFLASH_ADDR:-tiflash0}:3930
118-
${TIFLASH_ADDR:-tiflash0}:9000
119-
${TIFLASH_ADDR:-tiflash0}:8123
120-
${TIFLASH_ADDR:-tiflash0}:9009
121-
TIMEOUT_CLIENT: 3600s
122-
TIMEOUT_CLIENT_FIN: 3600s
123-
TIMEOUT_SERVER: 3600s
124-
TIMEOUT_SERVER_FIN: 3600s
125-
TIMEOUT_TUNNEL: 3600s
126-
depends_on:
127-
- "tiflash0"
128-
restart: on-failure
129108
tikv-learner0:
130109
image: hub.pingcap.net/tiflash/tikv-learner:191025
131110
ports:
@@ -142,16 +121,16 @@ services:
142121
- --data-dir=/data
143122
- --log-file=/log/tikv.log
144123
depends_on:
145-
- "tiflash-gateway0"
124+
- "tiflash0"
146125
restart: on-failure
147126
tiflash-cluster-manager0:
148127
image: hub.pingcap.net/tiflash/cluster_manage:latest
149128
volumes:
150-
- ./config/tiflash-cluster-manager.xml:/config.xml:ro
129+
- ./config/tiflash.xml:/config.xml:ro
151130
- ./log/tiflash-cluster-manager0:/tmp/tiflash/data/tmp
152131
command:
153132
- /config.xml
154133
depends_on:
155134
- "tidb0"
156-
- "tiflash-gateway0"
135+
- "tiflash0"
157136
restart: on-failure

Diff for: tests/docker/run.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ docker-compose down
66

77
rm -rf ./data ./log
88

9-
docker-compose up -d --scale tiflash-gateway0=0 --scale tics0=0 --scale tics-gtest=0 --scale tiflash0=0 --scale tikv-learner0=0 --scale tiflash-cluster-manager0=0
9+
docker-compose up -d --scale tics0=0 --scale tics-gtest=0 --scale tiflash0=0 --scale tikv-learner0=0 --scale tiflash-cluster-manager0=0
1010

1111
sleep 60
1212

@@ -16,12 +16,12 @@ docker-compose exec -T tiflash0 bash -c 'cd /tests ; ./run-test.sh fullstack-tes
1616
docker-compose down
1717

1818
# (only tics0 up)
19-
docker-compose up -d --scale tiflash-gateway0=0 --scale tics-gtest=0 --scale tiflash0=0 --scale tikv-learner0=0 --scale tikv0=0 --scale tidb0=0 --scale pd0=0 --scale tiflash-cluster-manager0=0
19+
docker-compose up -d --scale tics-gtest=0 --scale tiflash0=0 --scale tikv-learner0=0 --scale tikv0=0 --scale tidb0=0 --scale pd0=0 --scale tiflash-cluster-manager0=0
2020
docker-compose exec -T tics0 bash -c 'cd /tests ; ./run-test.sh mutable-test'
2121
docker-compose down
2222

2323
# run gtest cases. (only tics-gtest up)
24-
docker-compose up -d --scale tiflash-gateway0=0 --scale tics0=0 --scale tiflash0=0 --scale tikv-learner0=0 --scale tikv0=0 --scale tidb0=0 --scale pd0=0 --scale tiflash-cluster-manager0=0
24+
docker-compose up -d --scale tics0=0 --scale tiflash0=0 --scale tikv-learner0=0 --scale tikv0=0 --scale tidb0=0 --scale pd0=0 --scale tiflash-cluster-manager0=0
2525
docker-compose exec -T tics-gtest bash -c 'cd /tests && ./run-gtest.sh'
2626
docker-compose down
2727

0 commit comments

Comments
 (0)