diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-10-07 16:30:07 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-10-07 16:30:07 +0200 |
| commit | 2f219cfd26edff2c688c7a83d2546b56d4d5c134 (patch) | |
| tree | d4d7c45529988f07fd255584db88155c604d3faf | |
| parent | 2c40a439adf680e5f9a540a0c27453f164c29d5f (diff) | |
| parent | ab7abdb968d0a455e3b0ed2f33722243283e9bb9 (diff) | |
Merge pull request #8317 from jtattermusch/backport_8316
Critical: backport #8316
| -rwxr-xr-x | tools/run_tests/dockerize/build_docker_and_run_tests.sh | 8 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tools/run_tests/dockerize/build_docker_and_run_tests.sh b/tools/run_tests/dockerize/build_docker_and_run_tests.sh index b4b172ddef..c3219c533d 100755 --- a/tools/run_tests/dockerize/build_docker_and_run_tests.sh +++ b/tools/run_tests/dockerize/build_docker_and_run_tests.sh @@ -61,6 +61,7 @@ CONTAINER_NAME="run_tests_$(uuidgen)" docker_instance_git_root=/var/local/jenkins/grpc # Run tests inside docker +DOCKER_EXIT_CODE=0 docker run \ -e "RUN_TESTS_COMMAND=$RUN_TESTS_COMMAND" \ -e "config=$config" \ @@ -81,7 +82,7 @@ docker run \ -w /var/local/git/grpc \ --name=$CONTAINER_NAME \ $DOCKER_IMAGE_NAME \ - bash -l "/var/local/jenkins/grpc/$DOCKER_RUN_SCRIPT" || DOCKER_FAILED="true" + bash -l "/var/local/jenkins/grpc/$DOCKER_RUN_SCRIPT" || DOCKER_EXIT_CODE=$? # use unique name for reports.zip to prevent clash between concurrent # run_tests.py runs @@ -93,7 +94,4 @@ rm -f ${TEMP_REPORTS_ZIP} # remove the container, possibly killing it first docker rm -f $CONTAINER_NAME || true -if [ "$DOCKER_FAILED" != "" ] && [ "$XML_REPORT" == "" ] -then - exit 1 -fi +exit $DOCKER_EXIT_CODE diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 3ccba877c9..c7d10e057f 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1369,7 +1369,7 @@ else: exit_code = 0 if BuildAndRunError.BUILD in errors: exit_code |= 1 - if BuildAndRunError.TEST in errors and not args.travis: + if BuildAndRunError.TEST in errors: exit_code |= 2 if BuildAndRunError.POST_TEST in errors: exit_code |= 4 |