[type:feature] modify e2e k8s to docker compose, cluster

apache · Oct 18, 2024 · 8d78261 · 8d78261
1 parent 370c4f7
commit 8d78261
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/shenyu-e2e/shenyu-e2e-case/compose/sync/shenyu-sync-websocket-cluster-jdbc.yml b/shenyu-e2e/shenyu-e2e-case/compose/sync/shenyu-sync-websocket-cluster-jdbc.yml
@@ -120,10 +120,6 @@ services:
       - TZ=Asia/Beijing
       - shenyu.sync.websocket.urls=ws://shenyu-admin-1:9095/websocket,ws://shenyu-admin-2:9095/websocket
       - shenyu.sync.websocket.allowOrigin=ws://localhost:9195
-      - spring.cloud.discovery.enabled=true
-      - eureka.client.enabled=true
-      - eureka.client.serviceUrl.defaultZone=http://shenyu-examples-eureka:8761/eureka/
-      - eureka.instance.prefer-ip-address=true
     healthcheck:
       test: [ "CMD-SHELL", "wget -q -O - http://shenyu-bootstrap:9195/actuator/health | grep UP || exit 1" ]
       interval: 10s

diff --git a/shenyu-e2e/shenyu-e2e-case/compose/sync/shenyu-sync-websocket-cluster-zookeeper.yml b/shenyu-e2e/shenyu-e2e-case/compose/sync/shenyu-sync-websocket-cluster-zookeeper.yml
@@ -145,10 +145,6 @@ services:
       - TZ=Asia/Beijing
       - shenyu.sync.websocket.urls=ws://shenyu-admin-1:9095/websocket,ws://shenyu-admin-2:9095/websocket
       - shenyu.sync.websocket.allowOrigin=ws://localhost:9195
-      - spring.cloud.discovery.enabled=true
-      - eureka.client.enabled=true
-      - eureka.client.serviceUrl.defaultZone=http://shenyu-examples-eureka:8761/eureka/
-      - eureka.instance.prefer-ip-address=true
     healthcheck:
       test: [ "CMD-SHELL", "wget -q -O - http://shenyu-bootstrap:9195/actuator/health | grep UP || exit 1" ]
       interval: 10s

diff --git a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-cluster/k8s/script/e2e-cluster-jdbc-compose.sh b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-cluster/k8s/script/e2e-cluster-jdbc-compose.sh
@@ -45,7 +45,7 @@ for sync in "${SYNC_ARRAY[@]}"; do
   sleep 10s
   docker ps -a
   ## run e2e-test
-  ./mvnw -B -f ./shenyu-e2e/pom.xml -pl shenyu-e2e-case/shenyu-e2e-case-http -am test
+  ./mvnw -B -f ./shenyu-e2e/pom.xml -pl shenyu-e2e-case/shenyu-e2e-case-cluster -am test
   # shellcheck disable=SC2181
   if (($?)); then
     echo "${sync}-sync-e2e-test failed"

diff --git a/...u-e2e/shenyu-e2e-case/shenyu-e2e-case-cluster/k8s/script/e2e-cluster-zookeeper-compose.sh b/...u-e2e/shenyu-e2e-case/shenyu-e2e-case-cluster/k8s/script/e2e-cluster-zookeeper-compose.sh
@@ -45,7 +45,7 @@ for sync in "${SYNC_ARRAY[@]}"; do
   sleep 10s
   docker ps -a
   ## run e2e-test
-  ./mvnw -B -f ./shenyu-e2e/pom.xml -pl shenyu-e2e-case/shenyu-e2e-case-http -am test
+  ./mvnw -B -f ./shenyu-e2e/pom.xml -pl shenyu-e2e-case/shenyu-e2e-case-cluster -am test
   # shellcheck disable=SC2181
   if (($?)); then
     echo "${sync}-sync-e2e-test failed"