From 6cca0e29382610b917c04374944e6e25391bf9c5 Mon Sep 17 00:00:00 2001 From: rafie Date: Thu, 6 Aug 2020 23:01:10 +0300 Subject: [PATCH] CircleCI: Fixed problem with GPU testing --- Dockerfile.gpu-test | 8 +++++--- opt/readies | 2 +- opt/system-setup.py | 22 ++++++++++++---------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Dockerfile.gpu-test b/Dockerfile.gpu-test index 943a03bd0..5c095f898 100644 --- a/Dockerfile.gpu-test +++ b/Dockerfile.gpu-test @@ -29,11 +29,13 @@ COPY --from=redis /usr/local/ /usr/local/ COPY ./opt/ opt/ COPY ./test/test_requirements.txt test/ -RUN ./opt/readies/bin/getpy3 -RUN ./opt/system-setup.py +RUN PIP=19.3.1 ./opt/readies/bin/getpy3 +RUN python3 -m pip install virtualenv + RUN set -e ;\ - python3 -m virtualenv venv --system-site-packages;\ + python3 -m virtualenv venv --system-site-packages ;\ . venv/bin/activate ;\ + python -m pip install pip==19.3.1 ;\ ./opt/system-setup.py ARG DEPS_ARGS="" diff --git a/opt/readies b/opt/readies index 14abdad48..36628e41f 160000 --- a/opt/readies +++ b/opt/readies @@ -1 +1 @@ -Subproject commit 14abdad4868c9adb011942830ffe748d1c05f073 +Subproject commit 36628e41f95c2c75a409971b8e2cd1a4cd3e86ed diff --git a/opt/system-setup.py b/opt/system-setup.py index c84aacaaf..ae2d498ea 100755 --- a/opt/system-setup.py +++ b/opt/system-setup.py @@ -18,15 +18,16 @@ def __init__(self, nop=False): def common_first(self): self.install_downloaders() self.setup_pip() - self.pip3_install("wheel virtualenv") - self.pip3_install("setuptools --upgrade") + self.pip_install("wheel virtualenv") + self.pip_install("setuptools --upgrade") if self.os == 'linux': self.install("ca-certificates") - self.install("git unzip wget patchelf awscli") + self.install("git unzip wget patchelf") self.install("coreutils") # for realpath def debian_compat(self): + self.pip_install("-IU --force-reinstall setuptools") self.install("build-essential cmake") self.install("python3-regex") self.install("python3-venv python3-psutil python3-networkx python3-numpy") # python3-skimage @@ -53,7 +54,7 @@ def redhat_compat(self): else: self.run("amazon-linux-extras install epel", output_on_error=True) self.install("python3-devel") - self.pip3_install("psutil") + self.pip_install("psutil") self.install_git_lfs_on_linux() @@ -76,14 +77,15 @@ def macosx(self): def common_last(self): self.run("python3 -m pip uninstall -y ramp-packer RLTest || true") # redis-py-cluster should be installed from git due to redis-py dependency - self.pip3_install("--no-cache-dir git+https://github.com/Grokzen/redis-py-cluster.git@master") - self.pip3_install("--no-cache-dir git+https://github.com/RedisLabsModules/RLTest.git@master") - self.pip3_install("--no-cache-dir git+https://github.com/RedisLabs/RAMP@master") + self.pip_install("--no-cache-dir git+https://github.com/Grokzen/redis-py-cluster.git@master") + self.pip_install("--no-cache-dir git+https://github.com/RedisLabsModules/RLTest.git@master") + self.pip_install("--no-cache-dir git+https://github.com/RedisLabs/RAMP@master") - self.pip3_install("-r %s/readies/paella/requirements.txt" % HERE) - self.pip3_install("-r %s/test/test_requirements.txt" % ROOT) + self.pip_install("-r %s/readies/paella/requirements.txt" % HERE) + self.pip_install("-r %s/test/test_requirements.txt" % ROOT) - self.pip3_install("mkdocs mkdocs-material mkdocs-extensions") + self.pip_install("awscli") + self.pip_install("mkdocs mkdocs-material mkdocs-extensions") #----------------------------------------------------------------------------------------------