mirror of https://github.com/grpc/grpc.git
[interop] Remove python dependencies from Go dockerfile and add v1.67.0 release (#37792)
<!-- If you know who should review your pull request, please assign it to that person, otherwise the pull request would get assigned randomly. If your pull request is for a specific language, please add the appropriate lang label. --> ## Why Thanks to @ejona86 for finding this. The python dependencies were wrongly added inpull/37827/head^20589e533cd. And from then on people were just maintaining what was there. Java had it then too. Java removed the extra dockerfile steps at977e4b1450## Testing Passing master branch test: https://source.cloud.google.com/results/invocations/79fc6c6f-c3d9-4692-870d-4d7002f4778a Passing ad-hoc interop matrix build: https://source.cloud.google.com/results/invocations/683d7487-2637-4a69-b65e-95dc82740679 Closes #37792 PiperOrigin-RevId: 681054405
Arjan Singh Bal
2 months ago
committed by
Copybara-Service
parent
229de2530b
commit
c938a7b564
10 changed files with 5 additions and 116 deletions
@ -1,7 +0,0 @@ |
||||
# Install Google Cloud Platform API libraries |
||||
# These are needed for uploading test results to BigQuery (e.g. by tools/run_tests scripts) |
||||
# This template is similar to gcp_api_libraries.include but installs the |
||||
# dependencies in a python virtual environment. This is required from pip 23.0 |
||||
# onwards as installation of system-wide packages is blocked by default. |
||||
RUN /bin/bash -c "source $PYTHON_ENV/bin/activate && \ |
||||
python3 -m pip install --upgrade google-auth==1.23.0 google-api-python-client==1.12.8 oauth2client==4.1.0" |
||||
@ -1,31 +0,0 @@ |
||||
#==================== |
||||
# run_tests.py python dependencies |
||||
|
||||
# Basic python dependencies to be able to run tools/run_tests python scripts |
||||
# These dependencies are not sufficient to build gRPC Python, gRPC Python |
||||
# deps are defined elsewhere (e.g. python_deps.include) |
||||
# This template is similar to run_tests_python_deps.include but installs the |
||||
# dependencies in a python virtual environment. This is required from pip 23.0 |
||||
# onwards as installation of system-wide packages is blocked by default. |
||||
RUN apt-get update && apt-get install -y ${'\\'} |
||||
python3 ${'\\'} |
||||
python3-pip ${'\\'} |
||||
python3-setuptools ${'\\'} |
||||
python3-yaml ${'\\'} |
||||
python3-venv ${'\\'} |
||||
&& apt-get clean |
||||
|
||||
# Create a python virtual env for installing required dependencies. |
||||
ENV PYTHON_ENV="/opt/venv/grpc-interop" |
||||
RUN python3 -m venv "$PYTHON_ENV" |
||||
RUN echo "source $PYTHON_ENV/bin/activate" >> ~/.bashrc |
||||
|
||||
# Use bash explicitly as /bin/sh doesn't support the "source" command. |
||||
# use pinned version of pip to avoid sudden breakages |
||||
# TODO(#36814): currently six is needed for tools/run_tests scripts |
||||
# but since our python2 usage is deprecated, we should get rid of it. |
||||
RUN /bin/bash -c "source $PYTHON_ENV/bin/activate && \ |
||||
python3 -m pip install --upgrade pip==19.3.1 && \ |
||||
python3 -m pip install six==1.16.0" |
||||
|
||||
<%include file="./gcp_api_libraries_venv.include"/> |
||||
@ -1 +1 @@ |
||||
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go:969ce4614d1152a43f9083e7d08f1932c63a1616@sha256:c925667feb3e065abf586a9e8b028f64b4673cb94bfb4b5e389c652ce906f5dc |
||||
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go:e779403fffab573454461a7357acf9851c14b640@sha256:7affc40dd8c229a12aff76c44b173ce786fced97e563777640b5d696f1d8cd89 |
||||
@ -1 +1 @@ |
||||
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.x:9a524415365a73162b7f463bf0409ca04f64a73c@sha256:9d02b61552a93770ebb022f588daf9acd1088d29197fe120e0b082ede73f4584 |
||||
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.x:a50334d44bb6c5d23b08622328d97266b4bfacd8@sha256:7affc40dd8c229a12aff76c44b173ce786fced97e563777640b5d696f1d8cd89 |
||||
Loading…
Reference in new issue