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 4e25e5b4a ci: split t/plugin to reduce CI run time (#8052)
4e25e5b4a is described below
commit 4e25e5b4acc2e8293787b8861d0b4c2715cdc3af
Author: soulbird <[email protected]>
AuthorDate: Fri Oct 14 13:18:29 2022 +0800
ci: split t/plugin to reduce CI run time (#8052)
Co-authored-by: soulbird <[email protected]>
---
.github/workflows/build.yml | 3 ++-
.github/workflows/centos7-ci.yml | 3 ++-
ci/centos7-ci.sh | 2 +-
ci/common.sh | 2 +-
ci/linux_openresty_common_runner.sh | 2 +-
t/lib/server.lua | 2 +-
.../{openid-configuration.json => openid-connect/configuration.json} | 0
7 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 96aec8b6d..6ea5806db 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,7 +30,8 @@ jobs:
- linux_openresty
- linux_openresty_1_19
test_dir:
- - t/plugin
+ - t/plugin/[a-k]*
+ - t/plugin/[l-z]*
- t/admin t/cli t/config-center-yaml t/control t/core t/debug
t/deployment t/discovery t/error_page t/misc
- t/node t/pubsub t/router t/script t/stream-node t/utils t/wasm
t/xds-library t/xrpc
diff --git a/.github/workflows/centos7-ci.yml b/.github/workflows/centos7-ci.yml
index 7467cde86..25152bd97 100644
--- a/.github/workflows/centos7-ci.yml
+++ b/.github/workflows/centos7-ci.yml
@@ -28,7 +28,8 @@ jobs:
fail-fast: false
matrix:
test_dir:
- - t/plugin
+ - t/plugin/[a-k]*
+ - t/plugin/[l-z]*
- t/admin t/cli t/config-center-yaml t/control t/core t/debug
t/deployment t/discovery t/error_page t/misc
- t/node t/pubsub t/router t/script t/stream-node t/utils t/wasm
t/xds-library
diff --git a/ci/centos7-ci.sh b/ci/centos7-ci.sh
index 543e54514..a9a3799ae 100755
--- a/ci/centos7-ci.sh
+++ b/ci/centos7-ci.sh
@@ -85,7 +85,7 @@ run_case() {
make init
set_coredns
# run test cases
- FLUSH_ETCD=1 prove -Itest-nginx/lib -I./ -r ${TEST_FILE_SUB_DIR} | tee
/tmp/test.result
+ FLUSH_ETCD=1 prove --timer -Itest-nginx/lib -I./ -r ${TEST_FILE_SUB_DIR} |
tee /tmp/test.result
rerun_flaky_tests /tmp/test.result
}
diff --git a/ci/common.sh b/ci/common.sh
index 2370067eb..23602de64 100644
--- a/ci/common.sh
+++ b/ci/common.sh
@@ -53,7 +53,7 @@ rerun_flaky_tests() {
fi
echo "Rerun $(echo "$tests" | xargs)"
- FLUSH_ETCD=1 prove -I./test-nginx/lib -I./ $(echo "$tests" | xargs)
+ FLUSH_ETCD=1 prove --timer -I./test-nginx/lib -I./ $(echo "$tests" | xargs)
}
install_grpcurl () {
diff --git a/ci/linux_openresty_common_runner.sh
b/ci/linux_openresty_common_runner.sh
index 02e5ea471..1ce9b7782 100755
--- a/ci/linux_openresty_common_runner.sh
+++ b/ci/linux_openresty_common_runner.sh
@@ -86,7 +86,7 @@ script() {
done
# APISIX_ENABLE_LUACOV=1 PERL5LIB=.:$PERL5LIB prove -Itest-nginx/lib -r t
- FLUSH_ETCD=1 prove -Itest-nginx/lib -I./ -r $TEST_FILE_SUB_DIR | tee
/tmp/test.result
+ FLUSH_ETCD=1 prove --timer -Itest-nginx/lib -I./ -r $TEST_FILE_SUB_DIR |
tee /tmp/test.result
rerun_flaky_tests /tmp/test.result
}
diff --git a/t/lib/server.lua b/t/lib/server.lua
index a8ec77af6..2bdf38103 100644
--- a/t/lib/server.lua
+++ b/t/lib/server.lua
@@ -449,7 +449,7 @@ end
function _M._well_known_openid_configuration()
local t = require("lib.test_admin")
- local openid_data = t.read_file("t/plugin/openid-configuration.json")
+ local openid_data =
t.read_file("t/plugin/openid-connect/configuration.json")
ngx.say(openid_data)
end
diff --git a/t/plugin/openid-configuration.json
b/t/plugin/openid-connect/configuration.json
similarity index 100%
rename from t/plugin/openid-configuration.json
rename to t/plugin/openid-connect/configuration.json
