[type:fix] e2e k8s

moremind · Oct 9, 2023 · 13f836c · 13f836c
1 parent 016153f
commit 13f836c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/k8s/script/e2e-springcloud-sync.sh b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/k8s/script/e2e-springcloud-sync.sh
@@ -46,10 +46,8 @@ for sync in ${SYNC_ARRAY[@]}; do
   fi
   kubectl apply -f "${PRGDIR}"/shenyu-admin-"${sync}".yml
   sh "${CUR_PATH}"/healthcheck.sh http://localhost:31095/actuator/health
-  kubectl logs "$(kubectl get pod -o wide | grep shenyu-admin | awk '{print $1}')"
   kubectl apply -f "${PRGDIR}"/shenyu-bootstrap-"${sync}".yml
   sh "${CUR_PATH}"/healthcheck.sh http://localhost:31195/actuator/health
-  kubectl logs "$(kubectl get pod -o wide | grep shenyu-bootstrap | awk '{print $1}')"
   kubectl apply -f "${PRGDIR}"/shenyu-examples-springcloud.yml
   sh "${CUR_PATH}"/healthcheck.sh http://localhost:30884/actuator/health
   sleep 10s
@@ -62,6 +60,8 @@ for sync in ${SYNC_ARRAY[@]}; do
     echo "${sync}-sync-e2e-test failed"
     exit 1
   fi
+  kubectl logs "$(kubectl get pod -o wide | grep shenyu-admin | awk '{print $1}')"
+  kubectl logs "$(kubectl get pod -o wide | grep shenyu-bootstrap | awk '{print $1}')"
   kubectl delete -f "${SHENYU_TESTCASE_DIR}"/k8s/shenyu-mysql.yml
   kubectl delete -f "${PRGDIR}"/shenyu-admin-"${sync}".yml
   kubectl delete -f "${PRGDIR}"/shenyu-bootstrap-"${sync}".yml

diff --git a/...cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginTest.java b/...cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginTest.java
@@ -21,12 +21,9 @@
 import org.apache.shenyu.e2e.client.admin.AdminClient;
 import org.apache.shenyu.e2e.client.gateway.GatewayClient;
 import org.apache.shenyu.e2e.engine.annotation.ShenYuScenario;
-import org.apache.shenyu.e2e.engine.scenario.specification.BeforeEachSpec;
 import org.apache.shenyu.e2e.engine.scenario.specification.CaseSpec;
 import org.apache.shenyu.e2e.enums.ServiceTypeEnum;
 import org.apache.shenyu.e2e.k8s.engine.annotation.ShenYuE2ETest;
-import org.apache.shenyu.e2e.model.ResourcesData;
-import org.apache.shenyu.e2e.model.response.SelectorDTO;
 import org.junit.jupiter.api.BeforeEach;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;