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 4644f60b32 [ISSUE #5518] Fix e2e test case can not run wget command
(#5519)
4644f60b32 is described below
commit 4644f60b3265ad9093a49489f4e5019a56d7a4b8
Author: Ricco Chen <[email protected]>
AuthorDate: Mon Apr 1 21:00:33 2024 +0800
[ISSUE #5518] Fix e2e test case can not run wget command (#5519)
---
.github/workflows/e2e-k8s.yml | 2 +-
.../shenyu-e2e-case-http/k8s/shenyu-examples-http.yml | 8 +++++---
.../k8s/shenyu-examples-springcloud.yml | 8 +++++---
.../k8s/shenyu-examples-websocket.yml | 10 +++++++---
4 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/e2e-k8s.yml b/.github/workflows/e2e-k8s.yml
index 52e52021ce..061b889b2f 100644
--- a/.github/workflows/e2e-k8s.yml
+++ b/.github/workflows/e2e-k8s.yml
@@ -94,8 +94,8 @@ jobs:
- name: Build Docker Image
run: |
- docker save apache/shenyu-admin:latest > /tmp/apache-shenyu-admin.tar
docker save apache/shenyu-bootstrap:latest >
/tmp/apache-shenyu-bootstrap.tar
+ docker save apache/shenyu-admin:latest > /tmp/apache-shenyu-admin.tar
- name: Upload Docker Image Artifacts
uses: actions/upload-artifact@v3
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-http/k8s/shenyu-examples-http.yml
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-http/k8s/shenyu-examples-http.yml
index c96ceea19c..f95b0aaaae 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-http/k8s/shenyu-examples-http.yml
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-http/k8s/shenyu-examples-http.yml
@@ -35,12 +35,14 @@ spec:
- image: shenyu-examples-http
name: shenyu-examples-http
livenessProbe:
- exec:
- command:
- - wget -q -O - http://localhost:8189/actuator/health | grep UP
|| exit 1
initialDelaySeconds: 10
failureThreshold: 3
timeoutSeconds: 2
+ exec:
+ command:
+ - /bin/sh
+ - "-c"
+ - wget -q -O - http://localhost:8189/actuator/health | grep UP
|| exit 1
env:
- name: shenyu.register.serverLists
value: http://shenyu-admin:9095
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/k8s/shenyu-examples-springcloud.yml
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/k8s/shenyu-examples-springcloud.yml
index a18d3101c4..2c222f4e12 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/k8s/shenyu-examples-springcloud.yml
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/k8s/shenyu-examples-springcloud.yml
@@ -35,14 +35,16 @@ spec:
- image: shenyu-examples-springcloud:latest
name: shenyu-examples-springcloud
livenessProbe:
- exec:
- command:
- - wget -q -O - http://localhost:8884/actuator/health | grep UP
|| exit 1
initialDelaySeconds: 30
periodSeconds: 10
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 3
+ exec:
+ command:
+ - /bin/sh
+ - "-c"
+ - wget -q -O - http://localhost:8884/actuator/health | grep UP
|| exit 1
env:
- name: shenyu.register.serverLists
value: http://shenyu-admin:9095
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-websocket/k8s/shenyu-examples-websocket.yml
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-websocket/k8s/shenyu-examples-websocket.yml
index 449e6ad0ed..86d1cf0489 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-websocket/k8s/shenyu-examples-websocket.yml
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-websocket/k8s/shenyu-examples-websocket.yml
@@ -35,12 +35,16 @@ spec:
- image: shenyu-example-spring-native-websocket:latest
name: shenyu-examples-websocket
livenessProbe:
+ initialDelaySeconds: 30
+ periodSeconds: 10
+ timeoutSeconds: 5
+ successThreshold: 1
+ failureThreshold: 3
exec:
command:
+ - /bin/sh
+ - "-c"
- wget -q -O - http://localhost:8868/actuator/health | grep UP
|| exit 1
- initialDelaySeconds: 30
- failureThreshold: 3
- timeoutSeconds: 2
env:
- name: shenyu.register.serverLists
value: http://shenyu-admin:9095
