Rollback Dockerfile changes

pull/11398/head
Ken Payson 8 years ago
parent 01b536c3e7
commit 1b0661bfd7
  1. 3
      tools/dockerfile/test/python_jessie_x64/Dockerfile
  2. 1
      tools/run_tests/helper_scripts/build_python.sh
  3. 9
      tools/run_tests/run_tests_matrix.py

@ -75,8 +75,7 @@ RUN pip install --upgrade google-api-python-client
RUN apt-get update && apt-get install -y \
python-all-dev \
python3-all-dev \
python-pip \
python3-pip
python-pip
# Install Python packages from PyPI
RUN pip install pip --upgrade

@ -146,7 +146,6 @@ fi
############################
# Perform build operations #
############################
$PYTHON -m pip install virtualenv
# Instnatiate the virtualenv, preferring to do so from the relevant python
# version. Even if these commands fail (e.g. on Windows due to name conflicts)

@ -247,15 +247,6 @@ def _create_portability_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS)
extra_args=extra_args + ['--build_only'],
inner_jobs=inner_jobs)
test_jobs += _generate_jobs(languages=['python'],
configs=['dbg'],
platforms=['linux'],
arch='default',
compiler='python3.4',
labels=['portability'],
extra_args=extra_args,
inner_jobs=inner_jobs)
test_jobs += _generate_jobs(languages=['python'],
configs=['dbg'],
platforms=['linux'],

Loading…
Cancel
Save