From: Cédric Ollivier Date: Thu, 6 Jul 2017 22:21:29 +0000 (+0200) Subject: Inherit packages when creating /src/tempest/.venv X-Git-Tag: opnfv-5.0.RC1~256 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7c46badb8a1957d99a982228d71a3ee9f63bcd29;p=functest.git 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 --- 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 \