aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/jenkins/grpc_interop_python
diff options
context:
space:
mode:
authorGravatar Vijay Pai <vpai@google.com>2016-01-13 12:25:33 -0800
committerGravatar Vijay Pai <vpai@google.com>2016-01-13 12:25:33 -0800
commit947ab265bd3e2c3488604e579bc1374e8c3051c8 (patch)
tree9f51b55e536ef830238df79444b00067b00a3950 /tools/jenkins/grpc_interop_python
parent5bd6f2e190f7cdf2857bff27cd4da860acf72aef (diff)
parent7149ca6bd0ce73a08fa512415d3f641a06a15a75 (diff)
Merge branch 'master' into bbuf
Diffstat (limited to 'tools/jenkins/grpc_interop_python')
-rw-r--r--tools/jenkins/grpc_interop_python/Dockerfile1
-rwxr-xr-xtools/jenkins/grpc_interop_python/build_interop.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/jenkins/grpc_interop_python/Dockerfile b/tools/jenkins/grpc_interop_python/Dockerfile
index 6034cbf955..047604b1b7 100644
--- a/tools/jenkins/grpc_interop_python/Dockerfile
+++ b/tools/jenkins/grpc_interop_python/Dockerfile
@@ -48,6 +48,7 @@ RUN apt-get update && apt-get install -y \
libc6-dbg \
libc6-dev \
libgtest-dev \
+ libssl-dev \
libtool \
make \
strace \
diff --git a/tools/jenkins/grpc_interop_python/build_interop.sh b/tools/jenkins/grpc_interop_python/build_interop.sh
index 8f5bfd11e2..39c93677d8 100755
--- a/tools/jenkins/grpc_interop_python/build_interop.sh
+++ b/tools/jenkins/grpc_interop_python/build_interop.sh
@@ -43,5 +43,5 @@ make install-certs
make
# build Python interop client and server
-CONFIG=opt ./tools/run_tests/build_python.sh 2.7
+CONFIG=opt ./tools/run_tests/build_python.sh