xDS interop: enable pod log collection in the buildscripts (grpc#9495)

- Enables pod log collection in all PSM interop jobs implemented in grpc/grpc#30594. - Associate test suite runs with their own log file, so it's displayed on the "Target Log" tab - Updates security job to not stop after a failed suite, so that authz_test run even if security_test failed - Fix run_test not returning correct exit status, causing false positives in some cases. See grpc/grpc#30768

Author: sergiitk

buildscripts/kokoro/psm-security.cfg

@@ -7,7 +7,7 @@ timeout_mins: 180
 action {
  define_artifacts {
  regex: "artifacts/**/*sponge_log.xml"
- regex: "artifacts/**/*sponge_log.log"
+ regex: "artifacts/**/*.log"
  strip_prefix: "artifacts"
  }
 }

buildscripts/kokoro/psm-security.sh

@@ -119,16 +119,20 @@ run_test() {
  # Test driver usage:
  # https://github.com/grpc/grpc/tree/master/tools/run_tests/xds_k8s_test_driver#basic-usage
  local test_name="${1:?Usage: run_test test_name}"
+ local out_dir="${TEST_XML_OUTPUT_DIR}/${test_name}"
+ mkdir -pv "${out_dir}"
  set -x
  python -m "tests.${test_name}" \
  --flagfile="${TEST_DRIVER_FLAGFILE}" \
  --kube_context="${KUBE_CONTEXT}" \
  --server_image="${SERVER_IMAGE_NAME}:${GIT_COMMIT}" \
  --client_image="${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" \
  --testing_version="${TESTING_VERSION}" \
- --xml_output_file="${TEST_XML_OUTPUT_DIR}/${test_name}/sponge_log.xml" \
- --force_cleanup
- set +x
+ --force_cleanup \
+ --collect_app_logs \
+ --log_dir="${out_dir}" \
+ --xml_output_file="${out_dir}/sponge_log.xml" \
+ |& tee "${out_dir}/sponge_log.log"
 }
 
 #######################################
@@ -170,9 +174,15 @@ main() {
  build_docker_images_if_needed
  # Run tests
  cd "${TEST_DRIVER_FULL_DIR}"
- run_test baseline_test
- run_test security_test
- run_test authz_test
+ local failed_tests=0
+ test_suites=("baseline_test" "security_test" "authz_test")
+ for test in "${test_suites[@]}"; do
+ run_test $test || (( failed_tests++ ))
+ done
+ echo "Failed test suites: ${failed_tests}"
+ if (( failed_tests > 0 )); then
+ exit 1
+ fi
 }
 
 main "$@"

buildscripts/kokoro/xds_k8s_lb.cfg

@@ -7,7 +7,7 @@ timeout_mins: 180
 action {
  define_artifacts {
  regex: "artifacts/**/*sponge_log.xml"
- regex: "artifacts/**/*sponge_log.log"
+ regex: "artifacts/**/*.log"
  strip_prefix: "artifacts"
  }
 }

buildscripts/kokoro/xds_k8s_lb.sh

@@ -118,6 +118,8 @@ run_test() {
  # Test driver usage:
  # https://github.com/grpc/grpc/tree/master/tools/run_tests/xds_k8s_test_driver#basic-usage
  local test_name="${1:?Usage: run_test test_name}"
+ local out_dir="${TEST_XML_OUTPUT_DIR}/${test_name}"
+ mkdir -pv "${out_dir}"
  set -x
  python -m "tests.${test_name}" \
  --flagfile="${TEST_DRIVER_FLAGFILE}" \
@@ -126,9 +128,11 @@ run_test() {
  --server_image="${SERVER_IMAGE_NAME}:${GIT_COMMIT}" \
  --client_image="${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" \
  --testing_version="${TESTING_VERSION}" \
- --xml_output_file="${TEST_XML_OUTPUT_DIR}/${test_name}/sponge_log.xml" \
- --force_cleanup
- set +x
+ --force_cleanup \
+ --collect_app_logs \
+ --log_dir="${out_dir}" \
+ --xml_output_file="${out_dir}/sponge_log.xml" \
+ |& tee "${out_dir}/sponge_log.log"
 }
 
 #######################################

buildscripts/kokoro/xds_url_map.cfg

@@ -7,7 +7,7 @@ timeout_mins: 90
 action {
  define_artifacts {
  regex: "artifacts/**/*sponge_log.xml"
- regex: "artifacts/**/*sponge_log.log"
+ regex: "artifacts/**/*.log"
  strip_prefix: "artifacts"
  }
 }

buildscripts/kokoro/xds_url_map.sh

@@ -118,15 +118,19 @@ run_test() {
  # Test driver usage:
  # https://github.com/grpc/grpc/tree/master/tools/run_tests/xds_k8s_test_driver#basic-usage
  local test_name="${1:?Usage: run_test test_name}"
+ local out_dir="${TEST_XML_OUTPUT_DIR}/${test_name}"
+ mkdir -pv "${out_dir}"
  set -x
  python -m "tests.${test_name}" \
  --flagfile="${TEST_DRIVER_FLAGFILE}" \
+ --flagfile="config/url-map.cfg" \
  --kube_context="${KUBE_CONTEXT}" \
  --client_image="${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" \
  --testing_version="${TESTING_VERSION}" \
- --xml_output_file="${TEST_XML_OUTPUT_DIR}/${test_name}/sponge_log.xml" \
- --flagfile="config/url-map.cfg"
- set +x
+ --collect_app_logs \
+ --log_dir="${out_dir}" \
+ --xml_output_file="${out_dir}/sponge_log.xml" \
+ |& tee "${out_dir}/sponge_log.log"
 }
 
 #######################################