diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-02-23 14:20:57 -0800 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-02-23 14:20:57 -0800 |
| commit | cd7bd2664cf0d3a132f4dbe5d5eeebcfe892bea6 (patch) | |
| tree | 7b8b40b85f7ac6a623e097d1af6f59cb3e388ba3 /tools | |
| parent | f37ffbc446b9463c31e30283a39c9236bbe2c5fe (diff) | |
| parent | 9ddd46587827cd0498b67a3972ec9c263ba393ab (diff) | |
Merge pull request #5317 from murgatroid99/node_test_reporting_fix
Extract reports.xml files from docker images in reports.zip
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/jenkins/build_docker_and_run_tests.sh | 5 | ||||
| -rwxr-xr-x | tools/jenkins/docker_run_tests.sh | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/tools/jenkins/build_docker_and_run_tests.sh b/tools/jenkins/build_docker_and_run_tests.sh index daa29b2f94..458e8ca0c7 100755 --- a/tools/jenkins/build_docker_and_run_tests.sh +++ b/tools/jenkins/build_docker_and_run_tests.sh @@ -86,11 +86,6 @@ docker run \ $DOCKER_IMAGE_NAME \ bash -l "/var/local/jenkins/grpc/$DOCKER_RUN_SCRIPT" || DOCKER_FAILED="true" -if [ "$XML_REPORT" != "" ] -then - docker cp "$CONTAINER_NAME:/var/local/git/grpc/$XML_REPORT" $git_root || true -fi - docker cp "$CONTAINER_NAME:/var/local/git/grpc/reports.zip" $git_root || true unzip -o $git_root/reports.zip -d $git_root || true rm -f reports.zip diff --git a/tools/jenkins/docker_run_tests.sh b/tools/jenkins/docker_run_tests.sh index 282b857351..2e40f8fd65 100755 --- a/tools/jenkins/docker_run_tests.sh +++ b/tools/jenkins/docker_run_tests.sh @@ -60,5 +60,6 @@ echo '</body></html>' >> index.html cd .. zip -r reports.zip reports +find . -name reports.xml | xargs zip reports.zip exit $exit_code |