cleanup distribtest Dockerimages

tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile

@@ -33,6 +33,5 @@ RUN rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E03
 RUN yum-config-manager --add-repo http://download.mono-project.com/repo/centos/
 
 RUN yum install -y mono
-RUN yum install -y git
 RUN yum install -y unzip
 RUN yum install -y nuget

tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile

@@ -40,4 +40,4 @@ RUN apt-get update && apt-get install -y \
     ca-certificates-mono \
     nuget
 
-RUN apt-get update && apt-get install -y git unzip
+RUN apt-get update && apt-get install -y unzip

tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile

@@ -40,4 +40,4 @@ RUN apt-get update && apt-get install -y \
     ca-certificates-mono \
     nuget
 
-RUN apt-get update && apt-get install -y git unzip
+RUN apt-get update && apt-get install -y unzip

tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile

@@ -37,4 +37,4 @@ RUN apt-get update && apt-get install -y \
     ca-certificates-mono \
     nuget
 
-RUN apt-get update && apt-get install -y git unzip
+RUN apt-get update && apt-get install -y unzip

tools/dockerfile/distribtest/csharp_ubuntu1504_x64/Dockerfile

@@ -37,4 +37,4 @@ RUN apt-get update && apt-get install -y \
     ca-certificates-mono \
     nuget
 
-RUN apt-get update && apt-get install -y git unzip
+RUN apt-get update && apt-get install -y unzip

tools/dockerfile/distribtest/csharp_ubuntu1510_x64/Dockerfile

@@ -37,4 +37,4 @@ RUN apt-get update && apt-get install -y \
     ca-certificates-mono \
     nuget
 
-RUN apt-get update && apt-get install -y git unzip
+RUN apt-get update && apt-get install -y unzip

tools/dockerfile/distribtest/csharp_ubuntu1604_x64/Dockerfile

@@ -34,4 +34,4 @@ RUN apt-get update && apt-get install -y \
     ca-certificates-mono \
     nuget
 
-RUN apt-get update && apt-get install -y git unzip
+RUN apt-get update && apt-get install -y unzip

tools/dockerfile/distribtest/csharp_wheezy_x64/Dockerfile

@@ -29,4 +29,4 @@
 
 FROM mono:4.2.2.30
 
-RUN apt-get update && apt-get install -y git unzip
+RUN apt-get update && apt-get install -y unzip

tools/dockerfile/distribtest/node_centos7_x64/Dockerfile

@@ -29,7 +29,6 @@
 
 FROM centos:7
 
-RUN yum install -y git
 RUN yum install -y curl
 
 # Install nvm

tools/dockerfile/distribtest/node_jessie_x64/Dockerfile

@@ -29,7 +29,7 @@
 
 FROM debian:jessie
 
-RUN apt-get update && apt-get install -y curl git
+RUN apt-get update && apt-get install -y curl
 
 # Install nvm
 RUN touch .profile

tools/dockerfile/distribtest/node_jessie_x86/Dockerfile

@@ -29,7 +29,7 @@
 
 FROM 32bit/debian:jessie
 
-RUN apt-get update && apt-get install -y curl git
+RUN apt-get update && apt-get install -y git
 
 # Install nvm
 RUN touch .profile

tools/dockerfile/distribtest/node_ubuntu1204_x64/Dockerfile

@@ -29,7 +29,7 @@
 
 FROM ubuntu:12.04
 
-RUN apt-get update && apt-get install -y curl git
+RUN apt-get update && apt-get install -y curl
 
 # Install nvm
 RUN touch .profile

tools/dockerfile/distribtest/node_ubuntu1404_x64/Dockerfile

@@ -29,7 +29,7 @@
 
 FROM ubuntu:14.04
 
-RUN apt-get update && apt-get install -y curl git
+RUN apt-get update && apt-get install -y curl
 
 # Install nvm
 RUN touch .profile

tools/dockerfile/distribtest/node_ubuntu1504_x64/Dockerfile

@@ -29,7 +29,7 @@
 
 FROM ubuntu:15.04
 
-RUN apt-get update && apt-get install -y curl git
+RUN apt-get update && apt-get install -y curl
 
 # Install nvm
 RUN touch .profile

tools/dockerfile/distribtest/node_ubuntu1510_x64/Dockerfile

@@ -29,7 +29,7 @@
 
 FROM ubuntu:15.10
 
-RUN apt-get update && apt-get install -y curl git
+RUN apt-get update && apt-get install -y curl
 
 # Install nvm
 RUN touch .profile

tools/dockerfile/distribtest/node_ubuntu1604_x64/Dockerfile

@@ -29,7 +29,7 @@
 
 FROM ubuntu:16.04
 
-RUN apt-get update && apt-get install -y curl git
+RUN apt-get update && apt-get install -y curl
 
 # Install nvm
 RUN touch .profile

tools/dockerfile/distribtest/python_arch_x64/Dockerfile

@@ -30,7 +30,6 @@
 FROM base/archlinux
 
 RUN pacman --noconfirm -Syy
-RUN pacman --noconfirm -S git
 RUN pacman --noconfirm -S python
 RUN pacman --noconfirm -S python-pip
 

tools/dockerfile/distribtest/python_centos6_x64/Dockerfile

@@ -29,7 +29,6 @@
 
 FROM centos:6
 
-RUN yum install -y git
 RUN yum install -y python
 
 RUN rpm -ivh http://dl.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm

tools/dockerfile/distribtest/python_centos7_x64/Dockerfile

@@ -29,7 +29,6 @@
 
 FROM centos:7
 
-RUN yum install -y git
 RUN yum install -y python
 RUN yum install -y epel-release
 RUN yum install -y python-pip

tools/dockerfile/distribtest/python_fedora20_x64/Dockerfile

@@ -29,9 +29,4 @@
 
 FROM fedora:20
 
-RUN yum clean all
+RUN yum clean all && yum update -y && yum install -y python python-pip
-RUN yum update -y
-RUN yum install -y git
-RUN yum install -y python
-RUN yum install -y python-pip
-

tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile

@@ -29,9 +29,4 @@
 
 FROM fedora:21
 
-RUN yum clean all
+RUN yum clean all && yum update -y && yum install -y python python-pip
-RUN yum update -y
-RUN yum install -y git
-RUN yum install -y python
-RUN yum install -y python-pip
-

tools/dockerfile/distribtest/python_fedora22_x64/Dockerfile

@@ -29,9 +29,4 @@
 
 FROM fedora:22
 
-RUN yum clean all
+RUN yum clean all && yum update -y && yum install -y python python-pip
-RUN yum update -y
-RUN yum install -y git
-RUN yum install -y python
-RUN yum install -y python-pip
-

tools/dockerfile/distribtest/python_fedora23_x64/Dockerfile

@@ -29,9 +29,4 @@
 
 FROM fedora:23
 
-RUN yum clean all
+RUN yum clean all && yum update -y && yum install -y python python-pip
-RUN yum update -y
-RUN yum install -y git
-RUN yum install -y python
-RUN yum install -y python-pip
-

tools/dockerfile/distribtest/python_jessie_x64/Dockerfile

@@ -29,6 +29,4 @@
 
 FROM debian:jessie
 
-RUN apt-get update
+RUN apt-get update && apt-get install -y python python-pip
-RUN apt-get install -y git python python-pip
-

tools/dockerfile/distribtest/python_jessie_x86/Dockerfile

@@ -29,6 +29,4 @@
 
 FROM 32bit/debian:jessie
 
-RUN apt-get update
+RUN apt-get update && apt-get install -y python python-pip
-RUN apt-get install -y git python python-pip
-

tools/dockerfile/distribtest/python_opensuse_x64/Dockerfile

@@ -29,7 +29,5 @@
 
 FROM opensuse:42.1
 
-RUN zypper --non-interactive install git
 RUN zypper --non-interactive install python
 RUN zypper --non-interactive install python-pip
-

tools/dockerfile/distribtest/python_ubuntu1204_x64/Dockerfile

@@ -29,8 +29,4 @@
 
 FROM ubuntu:12.04
 
-RUN apt-get update -y
+RUN apt-get update -y && apt-get install -y python python-pip
-RUN apt-get install -y git
-RUN apt-get install -y python
-RUN apt-get install -y python-pip
-

tools/dockerfile/distribtest/python_ubuntu1404_x64/Dockerfile

@@ -29,8 +29,4 @@
 
 FROM ubuntu:14.04
 
-RUN apt-get update -y
+RUN apt-get update -y && apt-get install -y python python-pip
-RUN apt-get install -y git
-RUN apt-get install -y python
-RUN apt-get install -y python-pip
-

tools/dockerfile/distribtest/python_ubuntu1504_x64/Dockerfile

@@ -29,8 +29,4 @@
 
 FROM ubuntu:15.04
 
-RUN apt-get update -y
+RUN apt-get update -y && apt-get install -y python python-pip
-RUN apt-get install -y git
-RUN apt-get install -y python
-RUN apt-get install -y python-pip
-

tools/dockerfile/distribtest/python_ubuntu1510_x64/Dockerfile

@@ -29,8 +29,4 @@
 
 FROM ubuntu:15.10
 
-RUN apt-get update -y
+RUN apt-get update -y && apt-get install -y python python-pip
-RUN apt-get install -y git
-RUN apt-get install -y python
-RUN apt-get install -y python-pip
-

tools/dockerfile/distribtest/python_ubuntu1604_x64/Dockerfile

@@ -29,8 +29,4 @@
 
 FROM ubuntu:16.04
 
-RUN apt-get update -y
+RUN apt-get update -y && apt-get install -y python python-pip
-RUN apt-get install -y git
-RUN apt-get install -y python
-RUN apt-get install -y python-pip
-

tools/dockerfile/distribtest/python_wheezy_x64/Dockerfile

@@ -29,6 +29,4 @@
 
 FROM debian:wheezy
 
-RUN apt-get update
+RUN apt-get update -y && apt-get install -y python python-pip
-RUN apt-get install -y git python python-pip
-

tools/dockerfile/distribtest/ruby_centos6_x64/Dockerfile

@@ -29,6 +29,4 @@
 
 FROM centos:6
 
-RUN yum install -y git
 RUN yum install -y ruby
-

tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile

@@ -29,6 +29,4 @@
 
 FROM centos:7
 
-RUN yum install -y git
 RUN yum install -y ruby
-

tools/dockerfile/distribtest/ruby_fedora20_x64/Dockerfile

@@ -29,8 +29,4 @@
 
 FROM fedora:20
 
-RUN yum clean all
+RUN yum clean all && yum update -y && yum install -y ruby
-RUN yum update -y
-RUN yum install -y git
-RUN yum install -y ruby
-

tools/dockerfile/distribtest/ruby_fedora21_x64/Dockerfile

@@ -29,8 +29,4 @@
 
 FROM fedora:21
 
-RUN yum clean all
+RUN yum clean all && yum update -y && yum install -y ruby
-RUN yum update -y
-RUN yum install -y git
-RUN yum install -y ruby
-

tools/dockerfile/distribtest/ruby_fedora22_x64/Dockerfile

@@ -29,8 +29,4 @@
 
 FROM fedora:22
 
-RUN yum clean all
+RUN yum clean all && yum update -y && yum install -y ruby
-RUN yum update -y
-RUN yum install -y git
-RUN yum install -y ruby
-

tools/dockerfile/distribtest/ruby_fedora23_x64/Dockerfile

@@ -29,8 +29,4 @@
 
 FROM fedora:23
 
-RUN yum clean all
+RUN yum clean all && yum update -y && yum install -y ruby
-RUN yum update -y
-RUN yum install -y git
-RUN yum install -y ruby
-

tools/dockerfile/distribtest/ruby_jessie_x64/Dockerfile

@@ -29,7 +29,4 @@
 
 FROM debian:jessie
 
-RUN apt-get update
+RUN apt-get update && apt-get install -y ruby-full
-RUN apt-get install -y git
-RUN apt-get install -y ruby-full
-

tools/dockerfile/distribtest/ruby_jessie_x86/Dockerfile

@@ -29,7 +29,4 @@
 
 FROM 32bit/debian:jessie
 
-RUN apt-get update
+RUN apt-get update && apt-get install -y ruby-full
-RUN apt-get install -y git
-RUN apt-get install -y ruby-full
-

tools/dockerfile/distribtest/ruby_opensuse_x64/Dockerfile

@@ -29,6 +29,4 @@
 
 FROM opensuse:42.1
 
-RUN zypper --non-interactive install git
 RUN zypper --non-interactive install ruby
-

tools/dockerfile/distribtest/ruby_ubuntu1204_x64/Dockerfile

@@ -29,7 +29,4 @@
 
 FROM ubuntu:12.04
 
-RUN apt-get update -y
+RUN apt-get update -y && apt-get install -y ruby-full
-RUN apt-get install -y git
-RUN apt-get install -y ruby-full
-

tools/dockerfile/distribtest/ruby_ubuntu1404_x64/Dockerfile

@@ -29,7 +29,4 @@
 
 FROM ubuntu:14.04
 
-RUN apt-get update -y
+RUN apt-get update -y && apt-get install -y ruby-full
-RUN apt-get install -y git
-RUN apt-get install -y ruby-full
-

tools/dockerfile/distribtest/ruby_ubuntu1504_x64/Dockerfile

@@ -29,7 +29,4 @@
 
 FROM ubuntu:15.04
 
-RUN apt-get update -y
+RUN apt-get update -y && apt-get install -y ruby-full
-RUN apt-get install -y git
-RUN apt-get install -y ruby-full
-

tools/dockerfile/distribtest/ruby_ubuntu1510_x64/Dockerfile

@@ -29,7 +29,4 @@
 
 FROM ubuntu:15.10
 
-RUN apt-get update -y
+RUN apt-get update -y && apt-get install -y ruby-full
-RUN apt-get install -y git
-RUN apt-get install -y ruby-full
-

tools/dockerfile/distribtest/ruby_ubuntu1604_x64/Dockerfile

@@ -29,7 +29,4 @@
 
 FROM ubuntu:16.04
 
-RUN apt-get update -y
+RUN apt-get update -y && apt-get install -y ruby-full
-RUN apt-get install -y git
-RUN apt-get install -y ruby-full
-

tools/dockerfile/distribtest/ruby_wheezy_x64/Dockerfile

@@ -29,7 +29,4 @@
 
 FROM debian:wheezy
 
-RUN apt-get update
+RUN apt-get update && apt-get install -y ruby-full
-RUN apt-get install -y git
-RUN apt-get install -y ruby-full
-

tools/jenkins/docker_run.sh

@@ -31,7 +31,7 @@
 # This script is invoked by build_docker_* inside a docker
 # container. You should never need to call this script on your own.
 
-set -e
+set -ex
 
 if [ "$RELATIVE_COPY_PATH" == "" ]
 then
@@ -39,7 +39,7 @@ then
   git clone --recursive "$EXTERNAL_GIT_ROOT" /var/local/git/grpc
 else
   mkdir -p "/var/local/git/grpc/$RELATIVE_COPY_PATH"
-  cp -r "$EXTERNAL_GIT_ROOT/$RELATIVE_COPY_PATH/*" "/var/local/git/grpc/$RELATIVE_COPY_PATH"
+  cp -r "$EXTERNAL_GIT_ROOT/$RELATIVE_COPY_PATH"/* "/var/local/git/grpc/$RELATIVE_COPY_PATH"
 fi
 
 if [ -x "$(command -v rvm)" ]

tools/run_tests/distribtest_targets.py

@@ -38,13 +38,13 @@ def create_docker_jobspec(name, dockerfile_dir, shell_command, environ={},
   """Creates jobspec for a task running under docker."""
   environ = environ.copy()
   environ['RUN_COMMAND'] = shell_command
+  environ['RELATIVE_COPY_PATH'] = 'test/distrib'
 
   docker_args=[]
   for k,v in environ.iteritems():
     docker_args += ['-e', '%s=%s' % (k, v)]
   docker_env = {'DOCKERFILE_DIR': dockerfile_dir,
-                'DOCKER_RUN_SCRIPT': 'tools/jenkins/docker_run.sh',
+                'DOCKER_RUN_SCRIPT': 'tools/jenkins/docker_run.sh'}
-                'RELATIVE_COPY_PATH': 'test/distrib'}
   jobspec = jobset.JobSpec(
           cmdline=['tools/jenkins/build_and_run_docker.sh'] + docker_args,
           environ=docker_env,