aboutsummaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'docker/Dockerfile')
-rw-r--r--docker/Dockerfile13
1 files changed, 9 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index abb9b0d7..603bc38b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,7 +14,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container"
# Environment variables
ARG BRANCH=master
ARG RALLY_TAG=stable/0.9
-ARG ODL_TAG=release/carbon
+ARG ODL_TAG=27b7911a5c2315145f2cf06726303dadfe508940
ARG OPENSTACK_TAG=stable/ocata
ARG VIMS_TAG=stable
ARG REPOS_DIR=/home/opnfv/repos
@@ -50,6 +50,7 @@ libzmq3-dev \
python-dev \
python-mock \
python-pip \
+python3 \
postgresql \
ruby \
ruby-dev \
@@ -79,9 +80,12 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack_requirements && \
git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
- update-requirements -s --source /src/openstack-requirements /src/rally/ && \
+ update-requirements -s --source /src/openstack-requirements /src/rally && \
+ git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \
+ update-requirements -s --source /src/openstack-requirements /src/refstack-client && \
pip install --src /src -cupper-constraints.txt \
- -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH /src/rally/ && \
+ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+ /src/rally -e/src/refstack-client && \
pip install --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
@@ -95,7 +99,8 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds /src/fds
# other repositories
-RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test
+RUN git clone --depth 1 https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
+ (cd src/odl_test && git checkout -b $ODL_TAG)
RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test
# Install tempest venv and create symlink for running refstack-client