Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5102 from jtattermusch/docker_git_clone

Browse Source 
No git clone for distrib tests
pull/5092/head^2
Jan Tattermusch 9 years ago
parent 41208893d4 b5f7397b08
commit f0defb0926
50 changed files with 50 additions and 145 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile
  2. 2
      tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile
  3. 2
      tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile
  4. 2
      tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile
  5. 2
      tools/dockerfile/distribtest/csharp_ubuntu1504_x64/Dockerfile
  6. 2
      tools/dockerfile/distribtest/csharp_ubuntu1510_x64/Dockerfile
  7. 2
      tools/dockerfile/distribtest/csharp_ubuntu1604_x64/Dockerfile
  8. 2
      tools/dockerfile/distribtest/csharp_wheezy_x64/Dockerfile
  9. 1
      tools/dockerfile/distribtest/node_centos7_x64/Dockerfile
  10. 2
      tools/dockerfile/distribtest/node_jessie_x64/Dockerfile
  11. 2
      tools/dockerfile/distribtest/node_jessie_x86/Dockerfile
  12. 2
      tools/dockerfile/distribtest/node_ubuntu1204_x64/Dockerfile
  13. 2
      tools/dockerfile/distribtest/node_ubuntu1404_x64/Dockerfile
  14. 2
      tools/dockerfile/distribtest/node_ubuntu1504_x64/Dockerfile
  15. 2
      tools/dockerfile/distribtest/node_ubuntu1510_x64/Dockerfile
  16. 2
      tools/dockerfile/distribtest/node_ubuntu1604_x64/Dockerfile
  17. 1
      tools/dockerfile/distribtest/python_arch_x64/Dockerfile
  18. 1
      tools/dockerfile/distribtest/python_centos6_x64/Dockerfile
  19. 1
      tools/dockerfile/distribtest/python_centos7_x64/Dockerfile
  20. 7
      tools/dockerfile/distribtest/python_fedora20_x64/Dockerfile
  21. 7
      tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile
  22. 7
      tools/dockerfile/distribtest/python_fedora22_x64/Dockerfile
  23. 7
      tools/dockerfile/distribtest/python_fedora23_x64/Dockerfile
  24. 4
      tools/dockerfile/distribtest/python_jessie_x64/Dockerfile
  25. 4
      tools/dockerfile/distribtest/python_jessie_x86/Dockerfile
  26. 2
      tools/dockerfile/distribtest/python_opensuse_x64/Dockerfile
  27. 6
      tools/dockerfile/distribtest/python_ubuntu1204_x64/Dockerfile
  28. 6
      tools/dockerfile/distribtest/python_ubuntu1404_x64/Dockerfile
  29. 6
      tools/dockerfile/distribtest/python_ubuntu1504_x64/Dockerfile
  30. 6
      tools/dockerfile/distribtest/python_ubuntu1510_x64/Dockerfile
  31. 6
      tools/dockerfile/distribtest/python_ubuntu1604_x64/Dockerfile
  32. 4
      tools/dockerfile/distribtest/python_wheezy_x64/Dockerfile
  33. 2
      tools/dockerfile/distribtest/ruby_centos6_x64/Dockerfile
  34. 2
      tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile
  35. 6
      tools/dockerfile/distribtest/ruby_fedora20_x64/Dockerfile
  36. 6
      tools/dockerfile/distribtest/ruby_fedora21_x64/Dockerfile
  37. 6
      tools/dockerfile/distribtest/ruby_fedora22_x64/Dockerfile
  38. 6
      tools/dockerfile/distribtest/ruby_fedora23_x64/Dockerfile
  39. 5
      tools/dockerfile/distribtest/ruby_jessie_x64/Dockerfile
  40. 5
      tools/dockerfile/distribtest/ruby_jessie_x86/Dockerfile
  41. 2
      tools/dockerfile/distribtest/ruby_opensuse_x64/Dockerfile
  42. 5
      tools/dockerfile/distribtest/ruby_ubuntu1204_x64/Dockerfile
  43. 5
      tools/dockerfile/distribtest/ruby_ubuntu1404_x64/Dockerfile
  44. 5
      tools/dockerfile/distribtest/ruby_ubuntu1504_x64/Dockerfile
  45. 5
      tools/dockerfile/distribtest/ruby_ubuntu1510_x64/Dockerfile
  46. 5
      tools/dockerfile/distribtest/ruby_ubuntu1604_x64/Dockerfile
  47. 5
      tools/dockerfile/distribtest/ruby_wheezy_x64/Dockerfile
  48. 3
      tools/jenkins/build_and_run_docker.sh
  49. 16
      tools/jenkins/docker_run.sh
  50. 1
      tools/run_tests/distribtest_targets.py

1
tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile
Unescape View File

@ -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

2
tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile
Unescape View File

@ -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

2
tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile
Unescape View File

@ -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

2
tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile
Unescape View File

@ -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

2
tools/dockerfile/distribtest/csharp_ubuntu1504_x64/Dockerfile
Unescape View File

@ -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

2
tools/dockerfile/distribtest/csharp_ubuntu1510_x64/Dockerfile
Unescape View File

@ -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

2
tools/dockerfile/distribtest/csharp_ubuntu1604_x64/Dockerfile
Unescape View File

@ -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

2
tools/dockerfile/distribtest/csharp_wheezy_x64/Dockerfile
Unescape View File

@ -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

1
tools/dockerfile/distribtest/node_centos7_x64/Dockerfile
Unescape View File

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

2
tools/dockerfile/distribtest/node_jessie_x64/Dockerfile
Unescape View File

@ -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

2
tools/dockerfile/distribtest/node_jessie_x86/Dockerfile
Unescape View File

@ -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

2
tools/dockerfile/distribtest/node_ubuntu1204_x64/Dockerfile
Unescape View File

@ -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

2
tools/dockerfile/distribtest/node_ubuntu1404_x64/Dockerfile
Unescape View File

@ -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

2
tools/dockerfile/distribtest/node_ubuntu1504_x64/Dockerfile
Unescape View File

@ -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

2
tools/dockerfile/distribtest/node_ubuntu1510_x64/Dockerfile
Unescape View File

@ -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

2
tools/dockerfile/distribtest/node_ubuntu1604_x64/Dockerfile
Unescape View File

@ -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

1
tools/dockerfile/distribtest/python_arch_x64/Dockerfile
Unescape View File

@ -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

1
tools/dockerfile/distribtest/python_centos6_x64/Dockerfile
Unescape View File

@ -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

1
tools/dockerfile/distribtest/python_centos7_x64/Dockerfile
Unescape View File

@ -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

7
tools/dockerfile/distribtest/python_fedora20_x64/Dockerfile
Unescape View File

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

7
tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile
Unescape View File

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

7
tools/dockerfile/distribtest/python_fedora22_x64/Dockerfile
Unescape View File

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

7
tools/dockerfile/distribtest/python_fedora23_x64/Dockerfile
Unescape View File

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

4
tools/dockerfile/distribtest/python_jessie_x64/Dockerfile
Unescape View File

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

4
tools/dockerfile/distribtest/python_jessie_x86/Dockerfile
Unescape View File

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

2
tools/dockerfile/distribtest/python_opensuse_x64/Dockerfile
Unescape View File

@ -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

6
tools/dockerfile/distribtest/python_ubuntu1204_x64/Dockerfile
Unescape View File

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

6
tools/dockerfile/distribtest/python_ubuntu1404_x64/Dockerfile
Unescape View File

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

6
tools/dockerfile/distribtest/python_ubuntu1504_x64/Dockerfile
Unescape View File

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

6
tools/dockerfile/distribtest/python_ubuntu1510_x64/Dockerfile
Unescape View File

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

6
tools/dockerfile/distribtest/python_ubuntu1604_x64/Dockerfile
Unescape View File

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

4
tools/dockerfile/distribtest/python_wheezy_x64/Dockerfile
Unescape View File

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

2
tools/dockerfile/distribtest/ruby_centos6_x64/Dockerfile
Unescape View File

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

2
tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile
Unescape View File

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

6
tools/dockerfile/distribtest/ruby_fedora20_x64/Dockerfile
Unescape View File

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

6
tools/dockerfile/distribtest/ruby_fedora21_x64/Dockerfile
Unescape View File

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

6
tools/dockerfile/distribtest/ruby_fedora22_x64/Dockerfile
Unescape View File

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

6
tools/dockerfile/distribtest/ruby_fedora23_x64/Dockerfile
Unescape View File

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

5
tools/dockerfile/distribtest/ruby_jessie_x64/Dockerfile
Unescape View File

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

5
tools/dockerfile/distribtest/ruby_jessie_x86/Dockerfile
Unescape View File

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

2
tools/dockerfile/distribtest/ruby_opensuse_x64/Dockerfile
Unescape View File

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

5
tools/dockerfile/distribtest/ruby_ubuntu1204_x64/Dockerfile
Unescape View File

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

5
tools/dockerfile/distribtest/ruby_ubuntu1404_x64/Dockerfile
Unescape View File

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

5
tools/dockerfile/distribtest/ruby_ubuntu1504_x64/Dockerfile
Unescape View File

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

5
tools/dockerfile/distribtest/ruby_ubuntu1510_x64/Dockerfile
Unescape View File

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

5
tools/dockerfile/distribtest/ruby_ubuntu1604_x64/Dockerfile
Unescape View File

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

5
tools/dockerfile/distribtest/ruby_wheezy_x64/Dockerfile
Unescape View File

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

3
tools/jenkins/build_and_run_docker.sh
Unescape View File

@ -37,9 +37,6 @@ cd $(dirname $0)/../..
git_root=$(pwd)
cd -
# Create a local branch so the child Docker script won't complain
git branch -f jenkins-docker
# Inputs
# DOCKERFILE_DIR - Directory in which Dockerfile file is located.
# DOCKER_RUN_SCRIPT - Script to run under docker (relative to grpc repo root)

16
tools/jenkins/docker_run.sh
Unescape View File

@ -31,18 +31,24 @@
# 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
mkdir -p /var/local/git
git clone --recursive "$EXTERNAL_GIT_ROOT" /var/local/git/grpc
if [ "$RELATIVE_COPY_PATH" == "" ]
then
mkdir -p /var/local/git
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"
fi
if [ -x "$(command -v rvm)" ]
then
rvm use ruby-2.1
fi
cd /var/local/git/grpc
nvm use 4 || true
cd /var/local/git/grpc
$RUN_COMMAND

1
tools/run_tests/distribtest_targets.py
Unescape View File

@ -38,6 +38,7 @@ 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():

Write Preview
Loading…
Cancel
Save