diff options
| author |  Matt Kwong <mattkwong@google.com> | 2017-12-20 15:26:34 -0800 |
|---|---|---|
| committer | Matt Kwong <mattkwong@google.com> | 2017-12-20 16:28:41 -0800 |
| commit | ae49cfd1a4da13e8fb17fadc6240621ce1e541bb (patch) | |
| tree | 16e963a7b36e357e17a0b8bc05ba2c875e8fff52 /kokoro | |
| parent | 6003a61255fe508924878ef0ce8207996e7b5d3c (diff) | |
Collect xml results for Kokoro
Diffstat (limited to 'kokoro')
| -rw-r--r-- | kokoro/linux/32-bit/continuous.cfg | 6 | ||||
| -rw-r--r-- | kokoro/linux/32-bit/presubmit.cfg | 6 | ||||
| -rw-r--r-- | kokoro/linux/64-bit/continuous.cfg | 6 | ||||
| -rw-r--r-- | kokoro/linux/64-bit/presubmit.cfg | 6 | ||||
| -rwxr-xr-x | kokoro/linux/build_and_run_docker.sh | 2 | ||||
| -rwxr-xr-x | kokoro/linux/pull_request_in_docker.sh | 2 |
6 files changed, 26 insertions, 2 deletions
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. |