try different test naming scheme

sergiitk · Dec 2, 2020 · b9e8984 · b9e8984
1 parent 5ba51f4
commit b9e8984
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/buildscripts/kokoro/xds-k8s.cfg b/buildscripts/kokoro/xds-k8s.cfg
@@ -5,8 +5,8 @@ build_file: "grpc-java/buildscripts/kokoro/xds-k8s.sh"
 timeout_mins: 90
 action {
   define_artifacts {
-    regex: "artifacts/*sponge_log.xml"
-    regex: "artifacts/*sponge_log.log"
+    regex: "artifacts/**/*sponge_log.xml"
+    regex: "artifacts/**/*sponge_log.log"
     strip_prefix: "artifacts"
   }
 }
diff --git a/buildscripts/kokoro/xds-k8s.sh b/buildscripts/kokoro/xds-k8s.sh
@@ -24,9 +24,8 @@ set -x
 # Script start
 echo "xDS interop tests on GKE"
 GITHUB_DIR="${KOKORO_ARTIFACTS_DIR}/github"
-ARTIFACTS_DIR="${KOKORO_ARTIFACTS_DIR}/artifacts"
+ARTIFACTS_DIR="${KOKORO_ARTIFACTS_DIR}/artifacts/github/grpc-java/xds-k8s"
 RUNNER_SKIP_BUILD="${RUNNER_SKIP_BUILD:-0}"
-mkdir -p "${ARTIFACTS_DIR}"
 
 # Language-specific repo
 SRC_DIR="${GITHUB_DIR}/grpc-java"
@@ -105,7 +104,9 @@ kubectl config rename-context "$(kubectl config current-context)" grpc-testing-s
 #--project=grpc-testing \
 #--network=default-vpc \
 echo "Running tests"
+mkdir -p "${ARTIFACTS_DIR}"
+mkdir -p "${ARTIFACTS_DIR}/baseline_test"
 cd "${RUNNER_DIR}"
 python -m tests.baseline_test \
   -v 0 --logger_levels=infrastructure:DEBUG,__main__:DEBUG \
-  --xml_output_file="${ARTIFACTS_DIR}/sponge_log.xml"
+  --xml_output_file="${ARTIFACTS_DIR}/baseline_test/sponge_log.xml"