From ae49cfd1a4da13e8fb17fadc6240621ce1e541bb Mon Sep 17 00:00:00 2001
From: Matt Kwong <mattkwong@google.com>
Date: Wed, 20 Dec 2017 15:26:34 -0800
Subject: Collect xml results for Kokoro

---
 kokoro/linux/32-bit/continuous.cfg     | 6 ++++++
 kokoro/linux/32-bit/presubmit.cfg      | 6 ++++++
 kokoro/linux/64-bit/continuous.cfg     | 6 ++++++
 kokoro/linux/64-bit/presubmit.cfg      | 6 ++++++
 kokoro/linux/build_and_run_docker.sh   | 2 +-
 kokoro/linux/pull_request_in_docker.sh | 2 +-
 6 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'kokoro')

diff --git a/kokoro/linux/32-bit/continuous.cfg b/kokoro/linux/32-bit/continuous.cfg
index 5e7f6755..28b66c07 100644
--- a/kokoro/linux/32-bit/continuous.cfg
+++ b/kokoro/linux/32-bit/continuous.cfg
@@ -3,3 +3,9 @@
 # Location of the build script in repository
 build_file: "protobuf/kokoro/linux/32-bit/build.sh"
 timeout_mins: 120
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.xml"
+  }
+}
diff --git a/kokoro/linux/32-bit/presubmit.cfg b/kokoro/linux/32-bit/presubmit.cfg
index 5e7f6755..28b66c07 100644
--- a/kokoro/linux/32-bit/presubmit.cfg
+++ b/kokoro/linux/32-bit/presubmit.cfg
@@ -3,3 +3,9 @@
 # Location of the build script in repository
 build_file: "protobuf/kokoro/linux/32-bit/build.sh"
 timeout_mins: 120
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.xml"
+  }
+}
diff --git a/kokoro/linux/64-bit/continuous.cfg b/kokoro/linux/64-bit/continuous.cfg
index e4abfd33..3a4faac1 100644
--- a/kokoro/linux/64-bit/continuous.cfg
+++ b/kokoro/linux/64-bit/continuous.cfg
@@ -3,3 +3,9 @@
 # Location of the build script in repository
 build_file: "protobuf/kokoro/linux/64-bit/build.sh"
 timeout_mins: 120
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.xml"
+  }
+}
diff --git a/kokoro/linux/64-bit/presubmit.cfg b/kokoro/linux/64-bit/presubmit.cfg
index e4abfd33..3a4faac1 100644
--- a/kokoro/linux/64-bit/presubmit.cfg
+++ b/kokoro/linux/64-bit/presubmit.cfg
@@ -3,3 +3,9 @@
 # Location of the build script in repository
 build_file: "protobuf/kokoro/linux/64-bit/build.sh"
 timeout_mins: 120
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.xml"
+  }
+}
diff --git a/kokoro/linux/build_and_run_docker.sh b/kokoro/linux/build_and_run_docker.sh
index 4eaa0282..6a1f327a 100755
--- a/kokoro/linux/build_and_run_docker.sh
+++ b/kokoro/linux/build_and_run_docker.sh
@@ -48,7 +48,7 @@ docker run \
 # Copy output artifacts
 if [ "$OUTPUT_DIR" != "" ]
 then
-  docker cp "$CONTAINER_NAME:/var/local/git/protobuf/$OUTPUT_DIR" "$git_root" || FAILED="true"
+  docker cp "$CONTAINER_NAME:/var/local/git/protobuf/$OUTPUT_DIR" "${git_root}/kokoro" || FAILED="true"
 fi
 
 # remove the container, possibly killing it first
diff --git a/kokoro/linux/pull_request_in_docker.sh b/kokoro/linux/pull_request_in_docker.sh
index fa5f0caa..23e63961 100755
--- a/kokoro/linux/pull_request_in_docker.sh
+++ b/kokoro/linux/pull_request_in_docker.sh
@@ -57,7 +57,7 @@ cat $OUTPUT_DIR/joblog
 # The directory that is copied from Docker back into the Kokoro workspace.
 COPY_FROM_DOCKER=/var/local/git/protobuf/testoutput
 mkdir -p $COPY_FROM_DOCKER
-TESTOUTPUT_XML_FILE=$COPY_FROM_DOCKER/testresults.xml
+TESTOUTPUT_XML_FILE=$COPY_FROM_DOCKER/sponge_log.xml
 
 # Process all the output files from "parallel" and package them into a single
 # .xml file with detailed, broken-down test output.
-- 
cgit v1.2.3