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 bdbee45cf [type: test] Fix health check for zookeeper:3.8.0 in E2E
(#5008)
bdbee45cf is described below
commit bdbee45cf44fd83deb2dc0cbd60657d3c10ce464
Author: 吴伟杰 <[email protected]>
AuthorDate: Tue Aug 15 15:26:35 2023 +0800
[type: test] Fix health check for zookeeper:3.8.0 in E2E (#5008)
* Fix health check for zookeeper:3.8.0
* Correct depends_on condition
---
.../src/test/resources/docker-compose.mysql.yml | 10 +++++-----
.../src/test/resources/docker-compose.mysql.yml | 10 +++++-----
.../src/test/resources/docker-compose.mysql.yml | 10 +++++-----
.../src/test/resources/docker-compose.mysql.yml | 10 +++++-----
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/resources/docker-compose.mysql.yml
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/resources/docker-compose.mysql.yml
index 2790efa70..736b0802d 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/resources/docker-compose.mysql.yml
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/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: 10
@@ -54,11 +54,11 @@ services:
- "9095:9095"
depends_on:
mysql:
- condition: service_started
+ condition: service_healthy
nacos:
- condition: service_started
+ condition: service_healthy
zookeeper:
- 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
@@ -121,4 +121,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
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/resources/docker-compose.mysql.yml
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/resources/docker-compose.mysql.yml
index 506d9c450..5b3a67b04 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/resources/docker-compose.mysql.yml
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/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:
mysql:
- condition: service_started
+ condition: service_healthy
nacos:
- condition: service_started
+ condition: service_healthy
zookeeper:
- condition: service_started
+ condition: service_healthy
environment:
- SPRING_PROFILES_ACTIVE=mysql
- spring.datasource.username=shenyue2e
@@ -121,4 +121,4 @@ services:
retries: 5
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
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/resources/docker-compose.mysql.yml
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/resources/docker-compose.mysql.yml
index 0c59c62e4..051991ef9 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/resources/docker-compose.mysql.yml
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/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
@@ -124,4 +124,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
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/docker-compose.mysql.yml
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/docker-compose.mysql.yml
index 535aa8c3e..f75c07634 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/docker-compose.mysql.yml
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/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
@@ -77,11 +77,11 @@ services:
start_period: 20s
depends_on:
mysql:
- condition: service_started
+ condition: service_healthy
nacos:
- condition: service_started
+ condition: service_healthy
zookeeper:
- 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
@@ -132,4 +132,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
