This is an automated email from the ASF dual-hosted git repository.
hefengen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 22d4731d91 [type: test] Fix zookeeper healthcheck in motan E2E (#5015)
22d4731d91 is described below
commit 22d4731d91635cbee7dde353cdd2f6cb300a1162
Author: 吴伟杰 <[email protected]>
AuthorDate: Wed Aug 16 21:41:18 2023 +0800
[type: test] Fix zookeeper healthcheck in motan E2E (#5015)
Co-authored-by: moremind <[email protected]>
---
.../src/test/resources/docker-compose.mysql.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/resources/docker-compose.mysql.yml
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/resources/docker-compose.mysql.yml
index 2a2146d07e..8d66d2fc39 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/resources/docker-compose.mysql.yml
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/resources/docker-compose.mysql.yml
@@ -24,7 +24,7 @@ services:
expose:
- 2181
healthcheck:
- test: [ "CMD", "curl", "-f", "http://localhost:8080/commands/stat"; ]
+ test: ["CMD-SHELL", "echo srvr | nc localhost 2181"]
interval: 10s
timeout: 5s
retries: 3
@@ -54,11 +54,11 @@ services:
- "9095:9095"
depends_on:
zookeeper:
- condition: service_started
+ condition: service_healthy
nacos:
- condition: service_started
+ condition: service_healthy
mysql:
- condition: service_started
+ condition: service_healthy
volumes:
-
../../target/test-classes/admin-application.yml:/opt/shenyu-admin/conf/application.yml
-
/tmp/shenyu-e2e/mysql/mysql-connector.jar:/opt/shenyu-admin/ext-lib/mysql-connector.jar
@@ -122,4 +122,4 @@ services:
retries: 10
start_period: 60s
volumes:
- - /tmp/shenyu-e2e/mysql/schema.sql:/docker-entrypoint-initdb.d/schema.sql
\ No newline at end of file
+ - /tmp/shenyu-e2e/mysql/schema.sql:/docker-entrypoint-initdb.d/schema.sql
