diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-02-18 15:35:56 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-02-18 15:35:56 -0800 |
| commit | b46672602965727de647a720b6cc3f3dca436a11 (patch) | |
| tree | 75b322880be2ef6e873fcc84858813c61b996bdb | |
| parent | 9c5f0b160576ac33147b7386ffe15b01a54eb4dc (diff) | |
Extract reports.xml files from docker images in reports.zip
| -rwxr-xr-x | tools/jenkins/build_docker_and_run_tests.sh | 5 | ||||
| -rwxr-xr-x | tools/jenkins/docker_run_tests.sh | 1 | ||||
| -rwxr-xr-x | tools/run_tests/run_node.sh | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/tools/jenkins/build_docker_and_run_tests.sh b/tools/jenkins/build_docker_and_run_tests.sh index e2ac7518f0..0ddf261032 100755 --- a/tools/jenkins/build_docker_and_run_tests.sh +++ b/tools/jenkins/build_docker_and_run_tests.sh @@ -82,11 +82,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..578bda170a 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.xml exit $exit_code diff --git a/tools/run_tests/run_node.sh b/tools/run_tests/run_node.sh index fb84b79e7f..178584ae8e 100755 --- a/tools/run_tests/run_node.sh +++ b/tools/run_tests/run_node.sh @@ -44,7 +44,6 @@ root=`pwd` test_directory='src/node/test' timeout=8000 - if [ "$CONFIG" = "gcov" ] then ./node_modules/.bin/istanbul cover --dir reports/node_coverage \ @@ -59,7 +58,7 @@ then echo '<html><head><meta http-equiv="refresh" content="0;URL=lcov-report/index.html"></head></html>' > \ ../reports/node_coverage/index.html else - JUNIT_REPORT_PATH=reports.xml JUNIT_REPORT_STACK=1 \ + JUNIT_REPORT_PATH=src/node/reports.xml JUNIT_REPORT_STACK=1 \ ./node_modules/.bin/mocha --timeout $timeout \ --reporter mocha-jenkins-reporter $test_directory fi |