[type:feat] update shenyu k8s yml

moremind · Sep 26, 2023 · 920a909 · 920a909
1 parent 7ba2f30
commit 920a909
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/e2e-k8s.yml b/.github/workflows/e2e-k8s.yml
@@ -86,13 +86,14 @@ jobs:
 
       - name: Build Docker Image
         run: |
-          docker save apache/shenyu-admin:latest apache/shenyu-bootstrap:latest > /tmp/apache-shenyu.tar
+          docker save apache/shenyu-admin:latest > /tmp/apache-shenyu-admin.tar
+          docker save apache/shenyu-bootstrap:latest > /tmp/apache-shenyu-bootstrap.tar
 
       - name: Upload Docker Image Artifacts
         uses: actions/upload-artifact@v3
         with:
           name: shenyu-images
-          path: /tmp/apache-shenyu.tar
+          path: /tmp/apache-shenyu-.*.tar
           retention-days: 1
 
   e2e-storage:
@@ -164,7 +165,8 @@ jobs:
       - name: Build k8s Cluster
         if: steps.filter.outputs.changed == 'true'
         run: |
-          sudo k3s ctr images import /tmp/apache-shenyu.tar
+          sudo k3s ctr images import /tmp/apache-shenyu-admin.tar
+          sudo k3s ctr images import /tmp/apache-shenyu-bootstrap.tar
 #          docker save apache/shenyu-admin:latest apache/shenyu-bootstrap:latest | sudo k3s ctr images import -
 
 #      - name: Setup Debug Session

diff --git a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-http/k8s/script/healthcheck.sh b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-http/k8s/script/healthcheck.sh
@@ -20,7 +20,7 @@ PRGDIR=$(dirname "$0")
 
 for service in $(grep -v -E "^$|^#" "${PRGDIR}"/services-"${1}".list)
 do
-    for loop in `seq 1 30`
+    for loop in $(seq 1 30)
     do
         status=$(curl -o /dev/null -s -w %{http_code} "$service")
         echo -e "curl $service response $status"

diff --git a/.../shenyu-e2e-engine/src/main/java/org/apache/shenyu/e2e/k8s/engine/ShenYuE2eExtension.java b/.../shenyu-e2e-engine/src/main/java/org/apache/shenyu/e2e/k8s/engine/ShenYuE2eExtension.java
@@ -78,7 +78,8 @@ public ConditionEvaluationResult evaluateExecutionCondition(final ExtensionConte
             // FIXME check service is available
             for (ShenYuE2ETest.Environment environment : environments) {
                 if (!SocketUtils.checkUrl(environment.service().baseUrl(), 3000)) {
-                    return ConditionEvaluationResult.disabled(environment.serviceName() + ":" + environment.service().baseUrl() + " is not available");
+                    throw new AssertionFailedError(environment.serviceName() + ":" + environment.service().baseUrl() + " is not available");
+                    //return ConditionEvaluationResult.disabled(environment.serviceName() + ":" + environment.service().baseUrl() + " is not available");
                 }
             }
             configure = ShenYuE2EEngineConfigure.fromAnnotation(testClass.getAnnotation(ShenYuE2ETest.class));