Collect xml results for Kokoro

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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

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.