Inherit packages when creating /src/tempest/.venv

[functest.git] / docker / Dockerfile.aarch64

diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index a043628..274db86 100644 (file)
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -73,7 +73,7 @@ RUN git config --global http.sslVerify false
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
 RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \
-        sed s/^tempest===.*$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@14.0.0#egg=tempest/ \
+        sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
         > upper-constraints.txt && \
     pip install --src /src -cupper-constraints.txt \
         git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
@@ -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 \