aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-07-01 05:02:56 +0000
committerCédric Ollivier <cedric.ollivier@orange.com>2017-07-06 11:18:51 +0200
commitd24a8f4bba627004ac4fcc27a8c85169c76cbb78 (patch)
tree2e59af1bf7baced545890f887db59537f3438075 /docker
parent1bcc91c7ba00738dbc7d25422bc957d4cbf3f3ba (diff)
Remove setup_env for refstack in Dockerfile
It creates a symlink for .tempest required by refstack, and then install the requirements of tempest into a virtualenv which should be located in the dir .tempest/.venv. Now refstack_client is located in /src like tempest to avoid a link in /usr/local/lib/python2.7/dist-packages. JIRA: FUNCTEST-846 Change-Id: I99cedd00daaac57f85532ef41b91da20dec3dcb8 Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile11
-rw-r--r--docker/Dockerfile.aarch6411
-rw-r--r--docker/thirdparty-requirements.txt2
3 files changed, 13 insertions, 11 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5c055ff3..8c857564 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,7 +14,6 @@ LABEL version="0.1" description="OPNFV Functest Docker container"
# Environment variables
ARG BRANCH=master
ARG RALLY_TAG=0.8.1
-ARG REFSTACK_TAG=15.0.0
ARG ODL_TAG=release/beryllium-sr4
ARG KINGBIRD_TAG=1.1.0
ARG VIMS_TAG=stable
@@ -109,10 +108,12 @@ RUN curl -L https://get.rvm.io | bash -s stable
# SFC integration
RUN /bin/bash -c ". /usr/local/lib/python2.7/dist-packages/sfc/tests/functest/setup_scripts/tacker_client_install.sh"
-# refstack-client integration
-RUN wget -q https://raw.githubusercontent.com/openstack/refstack-client/master/setup_env \
- && bash setup_env -t ${REFSTACK_TAG} && rm setup_env
-RUN ln -s ${HOME}/.tempest /usr/local/lib/python2.7/dist-packages/.tempest
+# 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
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 48702331..a043628d 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -14,7 +14,6 @@ LABEL version="0.1" description="OPNFV Functest Aarch64 Docker container"
# Environment variables
ARG BRANCH=master
ARG RALLY_TAG=0.8.1
-ARG REFSTACK_TAG=15.0.0
ARG ODL_TAG=release/beryllium-sr4
ARG KINGBIRD_TAG=0.2.2
ARG VIMS_TAG=stable
@@ -105,10 +104,12 @@ RUN curl -L https://get.rvm.io | bash -s stable
# SFC integration
RUN /bin/bash -c ". /usr/local/lib/python2.7/dist-packages/sfc/tests/functest/setup_scripts/tacker_client_install.sh"
-# refstack-client integration
-RUN wget -q https://raw.githubusercontent.com/openstack/refstack-client/master/setup_env \
- && bash setup_env -t ${REFSTACK_TAG} && rm setup_env
-RUN ln -s ${HOME}/.tempest /usr/local/lib/python2.7/dist-packages/.tempest
+# 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
RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
&& cd ${REPOS_VNFS_DIR}/vims-test \
diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt
index 0fc58b10..5e60fb74 100644
--- a/docker/thirdparty-requirements.txt
+++ b/docker/thirdparty-requirements.txt
@@ -5,4 +5,4 @@ git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning
git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc
tosca-parser>=0.7.0 # Apache-2.0
heat-translator>=0.4.0 # Apache-2.0
-git+https://github.com/openstack/refstack-client#egg=refstack-client
+-e git+https://github.com/openstack/refstack-client#egg=refstack-client