[apisix] branch master updated: ci: adjust the kubernetes test directory (#6466)

[spacewander]

This is an automated email from the ASF dual-hosted git repository.

spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new 450c10d  ci: adjust the kubernetes test directory (#6466)
450c10d is described below

commit 450c10dd0e32da0e415a8cdb510b32f812626b4c
Author: tzssangglass <tzssanggl...@gmail.com>
AuthorDate: Tue Mar 1 10:56:56 2022 +0800

    ci: adjust the kubernetes test directory (#6466)
---
 .github/workflows/kubernetes-ci.yml                   | 6 +++---
 ci/kubernetes-ci.sh                                   | 2 +-
 {t_kubernetes => t/kubernetes}/configs/account.yaml   | 0
 {t_kubernetes => t/kubernetes}/configs/endpoint.yaml  | 0
 {t_kubernetes => t/kubernetes}/configs/kind.yaml      | 0
 {t_kubernetes => t/kubernetes}/discovery/kubernetes.t | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/kubernetes-ci.yml 
b/.github/workflows/kubernetes-ci.yml
index b622d34..9fad8b8 100644
--- a/.github/workflows/kubernetes-ci.yml
+++ b/.github/workflows/kubernetes-ci.yml
@@ -55,13 +55,13 @@ jobs:
           chmod +x ./kind
           chmod +x ./kubectl
 
-          ./kind create cluster --name apisix-test --config 
./t_kubernetes/configs/kind.yaml
+          ./kind create cluster --name apisix-test --config 
./t/kubernetes/configs/kind.yaml
 
           ./kubectl wait --for=condition=Ready nodes --all --timeout=180s
 
-          ./kubectl apply -f ./t_kubernetes/configs/account.yaml
+          ./kubectl apply -f ./t/kubernetes/configs/account.yaml
 
-          ./kubectl apply -f ./t_kubernetes/configs/endpoint.yaml
+          ./kubectl apply -f ./t/kubernetes/configs/endpoint.yaml
 
           KUBERNETES_CLIENT_TOKEN_CONTENT=$(./kubectl get secrets | grep 
apisix-test | awk '{system("./kubectl get secret -o jsonpath={.data.token} "$1" 
| base64 --decode")}')
 
diff --git a/ci/kubernetes-ci.sh b/ci/kubernetes-ci.sh
index 839929b..c40b8c7 100755
--- a/ci/kubernetes-ci.sh
+++ b/ci/kubernetes-ci.sh
@@ -21,7 +21,7 @@
 run_case() {
     export_or_prefix
     export PERL5LIB=.:$PERL5LIB
-    prove -Itest-nginx/lib -I./ -r t_kubernetes | tee test-result
+    prove -Itest-nginx/lib -I./ -r t/kubernetes | tee test-result
     rerun_flaky_tests test-result
 }
 
diff --git a/t_kubernetes/configs/account.yaml 
b/t/kubernetes/configs/account.yaml
similarity index 100%
rename from t_kubernetes/configs/account.yaml
rename to t/kubernetes/configs/account.yaml
diff --git a/t_kubernetes/configs/endpoint.yaml 
b/t/kubernetes/configs/endpoint.yaml
similarity index 100%
rename from t_kubernetes/configs/endpoint.yaml
rename to t/kubernetes/configs/endpoint.yaml
diff --git a/t_kubernetes/configs/kind.yaml b/t/kubernetes/configs/kind.yaml
similarity index 100%
rename from t_kubernetes/configs/kind.yaml
rename to t/kubernetes/configs/kind.yaml
diff --git a/t_kubernetes/discovery/kubernetes.t 
b/t/kubernetes/discovery/kubernetes.t
similarity index 99%
rename from t_kubernetes/discovery/kubernetes.t
rename to t/kubernetes/discovery/kubernetes.t
index 9d44e6a..4a7b857 100644
--- a/t_kubernetes/discovery/kubernetes.t
+++ b/t/kubernetes/discovery/kubernetes.t
@@ -678,7 +678,7 @@ discovery:
 
 
 
-=== TEST 15: scale endpoints
+=== TEST 14: scale endpoints
 --- yaml_config eval: $::yaml_config
 --- request eval
 [