testing pr

requirements.txt

@@ -23,12 +23,12 @@ cookiecutter==1.4.0
 croniter==1.3.4
 decorator==4.1.2
 docker==5.0.3
-dulwich==0.18.4
+dulwich==0.17.3
 ephemeral-port-reserve==1.1.0
 future==0.16.0
 google-auth==1.2.0
 graphviz==0.8.2
-grpcio==1.46.3
+grpcio==1.62.2
 gunicorn==19.8.1
 http-parser==0.9.0
 humanfriendly==4.18
@@ -61,7 +61,7 @@ ply==3.4
 poyo==0.4.0
 progressbar2==3.10.1
 prometheus-client==0.7.1
-protobuf==3.20.3
+protobuf==3.15.0
 py==1.5.2
 pyasn1==0.4.2
 pyasn1-modules==0.2.1
@@ -79,7 +79,7 @@ python-iptables==1.0.1
 python-utils==2.0.1
 pytimeparse==1.1.5
 pytz==2016.10
-pyyaml==6.0
+pyyaml==6.0.1
 repoze.lru==0.6
 requests==2.25.0
 requests-cache==0.6.3

tox.ini

@@ -12,6 +12,7 @@ passenv = SSH_AUTH_SOCK PAASTA_ENV DOCKER_HOST CI
 setenv =
     TZ = UTC
 deps =
+    --only-binary=grpcio
     --requirement={toxinidir}/requirements.txt
     --requirement={toxinidir}/requirements-dev.txt
     --editable={toxinidir}
@@ -27,6 +28,7 @@ commands =
 envdir = .tox/py38-linux/
 passenv = PAASTA_TEST_CLUSTER KUBECONFIG PAASTA_SYSTEM_CONFIG_DIR
 deps =
+    --only-binary=grpcio
     --requirement={toxinidir}/requirements.txt
     --requirement={toxinidir}/requirements-dev.txt
     --requirement={toxinidir}/yelp_package/extra_requirements_yelp.txt
@@ -43,6 +45,7 @@ setenv =
     PAASTA_SYSTEM_CONFIG_DIR = ./etc_paasta_playground/
     PAASTA_API_SOA_DIR = ./soa_config_playground
 deps =
+    --only-binary=grpcio
     --requirement={toxinidir}/requirements.txt
     --requirement={toxinidir}/requirements-dev.txt
     --requirement={toxinidir}/yelp_package/extra_requirements_yelp.txt
@@ -62,7 +65,10 @@ commands =
 
 [testenv:tests-yelpy]
 envdir = .tox/py38-linux/
+setenv =
+    PIP_INDEX_URL = http://169.254.255.254:20641/simple/
 deps =
+    --only-binary=grpcio
     --requirement={toxinidir}/requirements.txt
     --requirement={toxinidir}/requirements-dev.txt
     --requirement={toxinidir}/yelp_package/extra_requirements_yelp.txt
@@ -177,7 +183,8 @@ commands =
 
 [testenv:install-hooks]
 basepython = python3.8
-deps = pre-commit
+deps =
+    pre-commit
 commands = pre-commit install -f --install-hooks
 
 [flake8]

yelp_package/dockerfiles/itest/api/Dockerfile

@@ -13,18 +13,24 @@
 # limitations under the License.
 
 ARG DOCKER_REGISTRY=docker-dev.yelpcorp.com/
-FROM ${DOCKER_REGISTRY}ubuntu:bionic
+FROM ${DOCKER_REGISTRY}ubuntu:jammy
 
-ARG PIP_INDEX_URL=https://pypi.yelpcorp.com/bionic/simple
+ARG PIP_INDEX_URL=https://pypi.yelpcorp.com/jammy/simple
 ENV PIP_INDEX_URL=$PIP_INDEX_URL
 
+RUN apt-get update -yq && \
+    apt-get install -yq \
+        # needed to add a ppa
+        software-properties-common && \
+    add-apt-repository ppa:deadsnakes/ppa
+
 RUN apt-get update > /dev/null && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        software-properties-common \
         gcc \
         git \
         curl \
         python3.8-dev \
+        python3.8-distutils \
         libffi-dev \
         libssl-dev \
         libyaml-dev \
@@ -36,7 +42,7 @@ WORKDIR /work
 ADD requirements.txt /work/
 RUN virtualenv /venv -ppython3.8 --no-download
 ENV PATH=/venv/bin:$PATH
-RUN pip install -r requirements.txt
+RUN pip install --only-binary=grpcio -r requirements.txt
 
 COPY yelp_package/dockerfiles/xenial/mesos-slave-secret /etc/
 COPY yelp_package/dockerfiles/itest/api/mesos-cli.json yelp_package/dockerfiles/xenial/mesos-slave-secret /nail/etc/

yelp_package/dockerfiles/itest/k8s/Dockerfile

@@ -13,14 +13,15 @@
 # limitations under the License.
 
 ARG DOCKER_REGISTRY=docker-dev.yelpcorp.com/
-FROM ${DOCKER_REGISTRY}ubuntu:bionic
+FROM ${DOCKER_REGISTRY}ubuntu:jammy
 
-ARG PIP_INDEX_URL=https://pypi.yelpcorp.com/bionic/simple
+ARG PIP_INDEX_URL=https://pypi.yelpcorp.com/jammy/simple
 ENV PIP_INDEX_URL=$PIP_INDEX_URL
 
-# Need Python 3.7
-RUN apt-get update > /dev/null && \
-    apt-get install -y --no-install-recommends curl software-properties-common && \
+RUN apt-get update -yq && \
+    apt-get install -yq \
+        # needed to add a ppa
+        software-properties-common && \
     add-apt-repository ppa:deadsnakes/ppa
 
 RUN apt-get update > /dev/null && \
@@ -29,6 +30,7 @@ RUN apt-get update > /dev/null && \
         git \
         curl \
         python3.8-dev \
+        python3.8-distutils \
         libffi-dev \
         libssl-dev \
         libyaml-dev \
@@ -45,7 +47,7 @@ WORKDIR /work
 ADD requirements.txt /work/
 RUN virtualenv /venv -ppython3.8 --no-download
 ENV PATH=/venv/bin:$PATH
-RUN pip install -r requirements.txt
+RUN pip install --only-binary=grpcio -r requirements.txt
 ADD yelp_package/dockerfiles/itest/k8s/wait_paasta_api.sh /venv/bin
 
 ADD . /work/