Merge pull request #107740 from brianpursley/legacy-script-fixes

legacy-script.sh fixes - junit output and add missing record_command
This commit is contained in:
Kubernetes Prow Robot
2022-02-03 17:34:00 -08:00
committed by GitHub
2 changed files with 9 additions and 4 deletions

View File

@@ -106,6 +106,11 @@ daemonsets="daemonsets"
controllerrevisions="controllerrevisions"
job="jobs"
# A junit-style XML test report will be generated in the directory specified by KUBE_JUNIT_REPORT_DIR, if set.
# If KUBE_JUNIT_REPORT_DIR is unset, and ARTIFACTS is set, then use what is set in ARTIFACTS.
if [[ -z "${KUBE_JUNIT_REPORT_DIR:-}" && -n "${ARTIFACTS:-}" ]]; then
export KUBE_JUNIT_REPORT_DIR="${ARTIFACTS}"
fi
# include shell2junit library
sh2ju="${KUBE_ROOT}/third_party/forked/shell2junit/sh2ju.sh"
@@ -606,7 +611,7 @@ runTests() {
#####################################
if kube::test::if_supports_resource "${pods}" ; then
run_recursive_resources_tests
record_command run_recursive_resources_tests
fi
@@ -929,7 +934,7 @@ runTests() {
############################
if kube::test::if_supports_resource "${podsecuritypolicies}" ; then
run_deprecated_api_tests
record_command run_deprecated_api_tests
fi