summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-07-07 00:21:29 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-07-07 08:02:38 +0200
commit7c46badb8a1957d99a982228d71a3ee9f63bcd29 (patch)
treedd1d4f5008703cd23ea48597831b94018f7446cb /docker
parentf2353484ddcca794d2c86d3dbe4d026ac906643f (diff)
Inherit packages when creating /src/tempest/.venv
It simply calls the --system-site-packages option as all requirements are already installed and then saves space. Change-Id: Ibb37e54bcbbb8bd9b84e6d43a694ab685b561db1 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile5
-rw-r--r--docker/Dockerfile.aarch645
2 files changed, 2 insertions, 8 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3856cce70..80db3c9b1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -110,10 +110,7 @@ RUN /bin/bash -c ". /usr/local/lib/python2.7/dist-packages/sfc/tests/functest/se
# Install tempest venv and create symlink for running refstack-client
RUN ln -s /src/tempest /src/refstack-client/.tempest \
- && virtualenv /src/tempest/.venv \
- && /src/tempest/.venv/bin/python -m pip install \
- -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata \
- -r/src/tempest/requirements.txt
+ && virtualenv --system-site-packages /src/tempest/.venv
RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
&& cd ${REPOS_VNFS_DIR}/vims-test \
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index a42fc3160..274db865b 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -106,10 +106,7 @@ RUN /bin/bash -c ". /usr/local/lib/python2.7/dist-packages/sfc/tests/functest/se
# Install tempest venv and create symlink for running refstack-client
RUN ln -s /src/tempest /src/refstack-client/.tempest \
- && virtualenv /src/tempest/.venv \
- && /src/tempest/.venv/bin/python -m pip install \
- -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata \
- -r/src/tempest/requirements.txt
+ && virtualenv --system-site-packages /src/tempest/.venv
RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
&& cd ${REPOS_VNFS_DIR}/vims-test \