Merge pull request #8316 from jtattermusch/fix_exitcode_reporting_p0

Critical: dont eat run_tests.py errors on test failure
pull/8320/head
Jan Tattermusch 9 years ago committed by GitHub
commit 824fbcf338
  1. 8
      tools/run_tests/dockerize/build_docker_and_run_tests.sh
  2. 2
      tools/run_tests/run_tests.py

@ -61,6 +61,7 @@ CONTAINER_NAME="run_tests_$(uuidgen)"
docker_instance_git_root=/var/local/jenkins/grpc docker_instance_git_root=/var/local/jenkins/grpc
# Run tests inside docker # Run tests inside docker
DOCKER_EXIT_CODE=0
docker run \ docker run \
-e "RUN_TESTS_COMMAND=$RUN_TESTS_COMMAND" \ -e "RUN_TESTS_COMMAND=$RUN_TESTS_COMMAND" \
-e "config=$config" \ -e "config=$config" \
@ -81,7 +82,7 @@ docker run \
-w /var/local/git/grpc \ -w /var/local/git/grpc \
--name=$CONTAINER_NAME \ --name=$CONTAINER_NAME \
$DOCKER_IMAGE_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 # use unique name for reports.zip to prevent clash between concurrent
# run_tests.py runs # run_tests.py runs
@ -93,7 +94,4 @@ rm -f ${TEMP_REPORTS_ZIP}
# remove the container, possibly killing it first # remove the container, possibly killing it first
docker rm -f $CONTAINER_NAME || true docker rm -f $CONTAINER_NAME || true
if [ "$DOCKER_FAILED" != "" ] && [ "$XML_REPORT" == "" ] exit $DOCKER_EXIT_CODE
then
exit 1
fi

@ -1423,7 +1423,7 @@ else:
exit_code = 0 exit_code = 0
if BuildAndRunError.BUILD in errors: if BuildAndRunError.BUILD in errors:
exit_code |= 1 exit_code |= 1
if BuildAndRunError.TEST in errors and not args.travis: if BuildAndRunError.TEST in errors:
exit_code |= 2 exit_code |= 2
if BuildAndRunError.POST_TEST in errors: if BuildAndRunError.POST_TEST in errors:
exit_code |= 4 exit_code |= 4

Loading…
Cancel
Save