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 4271cb885d [type: feature] replenish alibaba-dubbo syn method (#4931)
4271cb885d is described below
commit 4271cb885d05716eb4f0bc10811b98ddcda65470
Author: SeaChess <[email protected]>
AuthorDate: Wed Aug 2 15:27:46 2023 +0800
[type: feature] replenish alibaba-dubbo syn method (#4931)
* replenish alibaba-dubbo syn method 01
* replenish alibaba-dubbo syn method 02
* replenish alibaba-dubbo syn method 03
* replenish alibaba-dubbo syn method 04
* replenish alibaba-dubbo syn method 05
* replenish alibaba-dubbo syn method 06
* replenish alibaba-dubbo syn method 07
* replenish alibaba-dubbo syn method 08
* replenish alibaba-dubbo syn method 09
* replenish alibaba-dubbo syn method 10
---------
Co-authored-by: dragon-zhang <[email protected]>
---
.../testcase/alibabadubbo}/DataSynHttpTest.java | 8 +++---
.../testcase/alibabadubbo}/DataSynNacosTest.java | 8 +++---
.../alibabadubbo}/DataSynZookeeperTest.java | 8 +++---
.../src/test/resources/docker-compose.mysql.yml | 31 ++++++++++++++++++++--
.../e2e/testcase/apachedubbo/DataSynHttpTest.java | 2 +-
.../e2e/testcase/apachedubbo/DataSynNacosTest.java | 2 +-
.../testcase/apachedubbo/DataSynZookeeperTest.java | 2 +-
.../src/test/resources/docker-compose.mysql.yml | 25 +++++++++++++----
.../shenyu/e2e/testcase/sofa/DataSynHttpTest.java | 2 +-
.../shenyu/e2e/testcase/sofa/DataSynNacosTest.java | 2 +-
.../e2e/testcase/sofa/DataSynZookeeperTest.java | 2 +-
.../src/test/resources/docker-compose.mysql.yml | 26 +++++++++++-------
.../src/test/resources/docker-compose.mysql.yml | 22 +++++++++++----
13 files changed, 101 insertions(+), 39 deletions(-)
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynHttpTest.java
similarity index 93%
copy from
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java
copy to
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynHttpTest.java
index de6ca59d97..aac495b5e9 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynHttpTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.e2e.testcase.sofa;
+package org.apache.shenyu.e2e.testcase.alibabadubbo;
import com.fasterxml.jackson.core.JsonProcessingException;
import org.apache.shenyu.e2e.client.admin.AdminClient;
@@ -63,12 +63,12 @@ public class DataSynHttpTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(20000);
+ Thread.sleep(10000);
List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(12, metaDataCacheList.size());
- Assertions.assertEquals(12, ruleCacheList.size());
+ Assertions.assertEquals(25, metaDataCacheList.size());
+ Assertions.assertEquals(25, ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynNacosTest.java
similarity index 93%
copy from
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java
copy to
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynNacosTest.java
index 25f688d9c1..b73fb8c04e 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynNacosTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.e2e.testcase.sofa;
+package org.apache.shenyu.e2e.testcase.alibabadubbo;
import com.fasterxml.jackson.core.JsonProcessingException;
import org.apache.shenyu.e2e.client.admin.AdminClient;
@@ -64,12 +64,12 @@ public class DataSynNacosTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(20000);
+ Thread.sleep(10000);
List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(12, metaDataCacheList.size());
- Assertions.assertEquals(12, ruleCacheList.size());
+ Assertions.assertEquals(25, metaDataCacheList.size());
+ Assertions.assertEquals(25, ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynZookeeperTest.java
similarity index 93%
copy from
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java
copy to
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynZookeeperTest.java
index 1c5d7270ab..f649b31027 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynZookeeperTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.e2e.testcase.sofa;
+package org.apache.shenyu.e2e.testcase.alibabadubbo;
import com.fasterxml.jackson.core.JsonProcessingException;
import org.apache.shenyu.e2e.client.admin.AdminClient;
@@ -63,13 +63,13 @@ public class DataSynZookeeperTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(20000);
+ Thread.sleep(10000);
List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(12, metaDataCacheList.size());
- Assertions.assertEquals(12, ruleCacheList.size());
+ Assertions.assertEquals(25, metaDataCacheList.size());
+ Assertions.assertEquals(25, ruleCacheList.size());
}
}
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 381baa3c27..83eb205298 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
@@ -23,6 +23,26 @@ services:
restart: always
expose:
- 2181
+ healthcheck:
+ test: ["CMD", "curl", "-f", "http://localhost:8080/commands/stat";]
+ interval: 10s
+ timeout: 5s
+ retries: 3
+
+ nacos:
+ image: nacos/nacos-server:v2.2.3
+ environment:
+ - TZ=Asia/Shanghai
+ - MODE=standalone
+ expose:
+ - 8848
+ - 9848
+ - 9849
+ healthcheck:
+ test: ["CMD", "curl", "-f",
"http://localhost:8848/nacos/actuator/health";]
+ interval: 10s
+ timeout: 5s
+ retries: 3
admin:
image: shenyu/admin:latest
@@ -30,6 +50,13 @@ services:
- 9095
ports:
- "9095:9095"
+ depends_on:
+ mysql:
+ condition: service_healthy
+ nacos:
+ condition: service_healthy
+ zookeeper:
+ 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
@@ -59,7 +86,7 @@ services:
- dubbo.zk=zookeeper://zookeeper:2181
- shenyu.register.serverLists=http://admin:9095
depends_on:
- gateway:
+ admin:
condition: service_healthy
gateway:
@@ -69,7 +96,7 @@ services:
ports:
- "9195:9195"
depends_on:
- admin:
+ dubbo:
condition: service_healthy
volumes:
-
../../target/test-classes/bootstrap-application.yml:/opt/shenyu-bootstrap/conf/application.yml
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynHttpTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynHttpTest.java
index 3e355e027e..81e3e42ebd 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynHttpTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynHttpTest.java
@@ -63,7 +63,7 @@ public class DataSynHttpTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(20000);
+ Thread.sleep(10000);
List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynNacosTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynNacosTest.java
index d669448e6e..5f0b49d230 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynNacosTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynNacosTest.java
@@ -64,7 +64,7 @@ public class DataSynNacosTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(20000);
+ Thread.sleep(10000);
List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynZookeeperTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynZookeeperTest.java
index 6ac15c7fcc..f40fcca053 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynZookeeperTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynZookeeperTest.java
@@ -63,7 +63,7 @@ public class DataSynZookeeperTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(20000);
+ Thread.sleep(10000);
List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
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 849d1149a1..783418e22e 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
@@ -21,6 +21,13 @@ services:
zookeeper:
image: zookeeper:3.8
restart: always
+ expose:
+ - 2181
+ healthcheck:
+ test: ["CMD", "curl", "-f", "http://localhost:8080/commands/stat";]
+ interval: 10s
+ timeout: 5s
+ retries: 3
nacos:
image: nacos/nacos-server:v2.2.3
@@ -31,10 +38,11 @@ services:
- 8848
- 9848
- 9849
- ports:
- - "8848:8848"
- - "9848:9848"
- - "9849:9849"
+ healthcheck:
+ test: ["CMD", "curl", "-f",
"http://localhost:8848/nacos/actuator/health";]
+ interval: 10s
+ timeout: 5s
+ retries: 3
admin:
image: shenyu/admin:latest
@@ -42,6 +50,13 @@ services:
- 9095
ports:
- "9095:9095"
+ depends_on:
+ mysql:
+ condition: service_healthy
+ nacos:
+ condition: service_healthy
+ zookeeper:
+ condition: service_healthy
environment:
- SPRING_PROFILES_ACTIVE=mysql
- spring.datasource.username=shenyue2e
@@ -81,7 +96,7 @@ services:
ports:
- "9195:9195"
depends_on:
- admin:
+ dubbo:
condition: service_healthy
volumes:
-
../../target/test-classes/bootstrap-application.yml:/opt/shenyu-bootstrap/conf/application.yml
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java
index de6ca59d97..395270344c 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java
@@ -63,7 +63,7 @@ public class DataSynHttpTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(20000);
+ Thread.sleep(10000);
List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java
index 25f688d9c1..23fb95a370 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java
@@ -64,7 +64,7 @@ public class DataSynNacosTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(20000);
+ Thread.sleep(10000);
List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java
index 1c5d7270ab..2e641e0d4b 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java
@@ -63,7 +63,7 @@ public class DataSynZookeeperTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(20000);
+ Thread.sleep(10000);
List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
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 226168673f..d5b4113a36 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
@@ -23,8 +23,11 @@ services:
restart: always
expose:
- 2181
- ports:
- - "2181:2181"
+ healthcheck:
+ test: ["CMD", "curl", "-f", "http://localhost:8080/commands/stat";]
+ interval: 10s
+ timeout: 5s
+ retries: 3
nacos:
image: nacos/nacos-server:v2.2.3
@@ -35,10 +38,11 @@ services:
- 8848
- 9848
- 9849
- ports:
- - "8848:8848"
- - "9848:9848"
- - "9849:9849"
+ healthcheck:
+ test: ["CMD", "curl", "-f",
"http://localhost:8848/nacos/actuator/health";]
+ interval: 10s
+ timeout: 5s
+ retries: 3
admin:
image: shenyu/admin:latest
@@ -48,7 +52,11 @@ services:
- "9095:9095"
depends_on:
zookeeper:
- condition: service_started
+ condition: service_healthy
+ nacos:
+ condition: service_healthy
+ mysql:
+ 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
@@ -70,7 +78,7 @@ services:
- shenyu.register.serverLists=http://admin:9095
- com.alipay.sofa.rpc.registry-address=zookeeper://zookeeper:2181
healthcheck:
- test: [ "CMD-SHELL", "wget -q -O - http://localhost:28011/sofa/findAll |
grep UP || exit 1" ]
+ test: ["CMD", "nc", "-z", "localhost", "28011"]
timeout: 2s
retries: 3
start_period: 5s
@@ -91,7 +99,7 @@ services:
ports:
- "9195:9195"
depends_on:
- admin:
+ sofa:
condition: service_healthy
volumes:
-
../../target/test-classes/bootstrap-application.yml:/opt/shenyu-bootstrap/conf/application.yml
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 3b0b7eaccb..e64ac6cfbb 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
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-#
+
version: '2.3'
services:
@@ -23,6 +23,11 @@ services:
restart: always
expose:
- 2181
+ healthcheck:
+ test: ["CMD", "curl", "-f", "http://localhost:8080/commands/stat";]
+ interval: 10s
+ timeout: 5s
+ retries: 3
nacos:
image: nacos/nacos-server:v2.2.3
@@ -33,10 +38,11 @@ services:
- 8848
- 9848
- 9849
- ports:
- - "8848:8848"
- - "9848:9848"
- - "9849:9849"
+ healthcheck:
+ test: ["CMD", "curl", "-f",
"http://localhost:8848/nacos/actuator/health";]
+ interval: 10s
+ timeout: 5s
+ retries: 3
admin:
image: shenyu/admin:latest
@@ -87,6 +93,12 @@ services:
depends_on:
eureka:
condition: service_healthy
+ mysql:
+ condition: service_healthy
+ nacos:
+ condition: service_healthy
+ zookeeper:
+ condition: service_healthy
healthcheck:
test: [ "CMD-SHELL", "wget -q -O -
http://springcloud:8884/actuator/health | grep UP || exit 1" ]
timeout: 2s
