Skip to content

Commit 700154f

Browse files
rafiefilipecosta90
authored andcommitted
CircleCI: Fixed problem with GPU testing (#440)
1 parent f056a11 commit 700154f

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

Dockerfile.gpu-test

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@ COPY --from=redis /usr/local/ /usr/local/
2929
COPY ./opt/ opt/
3030
COPY ./test/test_requirements.txt test/
3131

32-
RUN ./opt/readies/bin/getpy3
33-
RUN ./opt/system-setup.py
32+
RUN PIP=19.3.1 ./opt/readies/bin/getpy3
33+
RUN python3 -m pip install virtualenv
34+
3435
RUN set -e ;\
35-
python3 -m virtualenv venv --system-site-packages;\
36+
python3 -m virtualenv venv --system-site-packages ;\
3637
. venv/bin/activate ;\
38+
python -m pip install pip==19.3.1 ;\
3739
./opt/system-setup.py
3840

3941
ARG DEPS_ARGS=""

opt/system-setup.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,16 @@ def __init__(self, nop=False):
1818
def common_first(self):
1919
self.install_downloaders()
2020
self.setup_pip()
21-
self.pip3_install("wheel virtualenv")
22-
self.pip3_install("setuptools --upgrade")
21+
self.pip_install("wheel virtualenv")
22+
self.pip_install("setuptools --upgrade")
2323

2424
if self.os == 'linux':
2525
self.install("ca-certificates")
26-
self.install("git unzip wget patchelf awscli")
26+
self.install("git unzip wget patchelf")
2727
self.install("coreutils") # for realpath
2828

2929
def debian_compat(self):
30+
self.pip_install("-IU --force-reinstall setuptools")
3031
self.install("build-essential cmake")
3132
self.install("python3-regex")
3233
self.install("python3-venv python3-psutil python3-networkx python3-numpy") # python3-skimage
@@ -53,7 +54,7 @@ def redhat_compat(self):
5354
else:
5455
self.run("amazon-linux-extras install epel", output_on_error=True)
5556
self.install("python3-devel")
56-
self.pip3_install("psutil")
57+
self.pip_install("psutil")
5758

5859
self.install_git_lfs_on_linux()
5960

@@ -76,14 +77,15 @@ def macosx(self):
7677
def common_last(self):
7778
self.run("python3 -m pip uninstall -y ramp-packer RLTest || true")
7879
# redis-py-cluster should be installed from git due to redis-py dependency
79-
self.pip3_install("--no-cache-dir git+https://github.com/Grokzen/redis-py-cluster.git@master")
80-
self.pip3_install("--no-cache-dir git+https://github.com/RedisLabsModules/RLTest.git@master")
81-
self.pip3_install("--no-cache-dir git+https://github.com/RedisLabs/RAMP@master")
80+
self.pip_install("--no-cache-dir git+https://github.com/Grokzen/redis-py-cluster.git@master")
81+
self.pip_install("--no-cache-dir git+https://github.com/RedisLabsModules/RLTest.git@master")
82+
self.pip_install("--no-cache-dir git+https://github.com/RedisLabs/RAMP@master")
8283

83-
self.pip3_install("-r %s/readies/paella/requirements.txt" % HERE)
84-
self.pip3_install("-r %s/test/test_requirements.txt" % ROOT)
84+
self.pip_install("-r %s/readies/paella/requirements.txt" % HERE)
85+
self.pip_install("-r %s/test/test_requirements.txt" % ROOT)
8586

86-
self.pip3_install("mkdocs mkdocs-material mkdocs-extensions")
87+
self.pip_install("awscli")
88+
self.pip_install("mkdocs mkdocs-material mkdocs-extensions")
8789

8890
#----------------------------------------------------------------------------------------------
8991

0 commit comments

Comments
 (0)