Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
824fbcf3
Commit
824fbcf3
authored
Oct 7, 2016
by
Jan Tattermusch
Committed by
GitHub
Oct 7, 2016
Browse files
Options
Downloads
Plain Diff
Merge pull request #8316 from jtattermusch/fix_exitcode_reporting_p0
Critical: dont eat run_tests.py errors on test failure
parents
602edbba
e480a6a1
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
tools/run_tests/dockerize/build_docker_and_run_tests.sh
+3
-5
3 additions, 5 deletions
tools/run_tests/dockerize/build_docker_and_run_tests.sh
tools/run_tests/run_tests.py
+1
-1
1 addition, 1 deletion
tools/run_tests/run_tests.py
with
4 additions
and
6 deletions
tools/run_tests/dockerize/build_docker_and_run_tests.sh
+
3
−
5
View file @
824fbcf3
...
...
@@ -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
This diff is collapsed.
Click to expand it.
tools/run_tests/run_tests.py
+
1
−
1
View file @
824fbcf3
...
...
@@ -1423,7 +1423,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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment