aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/distrib/python
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2016-05-06 12:16:28 -0700
committerGravatar Jan Tattermusch <jtattermusch@google.com>2016-05-06 12:16:28 -0700
commit6f0fe0f32728dfa781e49451a755d73df5fa6a88 (patch)
tree2d4ecdf4896c17e47ac830a1d1cc78f41c421fac /test/distrib/python
parent8c33c7442c79682d2e545820f5653cabf25fd07e (diff)
fix python distribtests with docker on overlay
Diffstat (limited to 'test/distrib/python')
-rwxr-xr-xtest/distrib/python/run_distrib_test.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/distrib/python/run_distrib_test.sh b/test/distrib/python/run_distrib_test.sh
index 6196e540c8..a0324a92b1 100755
--- a/test/distrib/python/run_distrib_test.sh
+++ b/test/distrib/python/run_distrib_test.sh
@@ -48,7 +48,10 @@ which $PYTHON || PYTHON=python
which $PIP || PIP=pip
# TODO(jtattermusch): this shouldn't be required
-${PIP} install --upgrade six pip
+# TODO(jtattermusch): run the command twice to workaround docker-on-overlay
+# issue https://github.com/docker/docker/issues/12327
+# (first attempt will fail when using docker with overlayFS)
+${PIP} install --upgrade six pip || ${PIP} install --upgrade six pip
# At least one of the bdist packages has to succeed (whichever one matches the
# test machine, anyway).