diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 10 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64 | 10 | ||||
| -rw-r--r-- | docker/thirdparty-requirements.txt | 2 |
3 files changed, 9 insertions, 13 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 5c055ff35..80db3c9b1 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 @@ -75,7 +74,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 \ @@ -109,10 +108,9 @@ 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 --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 487023314..274db865b 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 @@ -74,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 \ @@ -105,10 +104,9 @@ 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 --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/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt index 0fc58b10d..5e60fb74f 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 |