Merge "Update Functest documentation for Euphrates"

[functest.git] / docker / Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6e5161c..ec2b3fa 100644 (file)
--- 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=35e415b6873b39d72775c88a337e92dac26012e2
+ARG ODL_TAG=e12ba90cd27577c4c6c70ee54f7d599b5f6777ba
 ARG OPENSTACK_TAG=stable/ocata
 ARG VIMS_TAG=stable
 ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2
@@ -52,6 +52,8 @@ python-dev \
 python-mock \
 python-pip \
 python3 \
+python3-dev \
+python3-pip \
 postgresql \
 ruby \
 ruby-dev \
@@ -62,6 +64,7 @@ wget \
 --no-install-recommends
 
 RUN pip install --upgrade pip && easy_install -U setuptools==30.0.0
+RUN python3 -m pip install --upgrade pip setuptools==30.0.0
 
 RUN mkdir -p ${REPOS_VNFS_DIR} \
     && mkdir -p ${FUNCTEST_BASE_DIR}/results \
@@ -79,7 +82,7 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
         > upper-constraints.txt && \
     pip install --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        -e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack_requirements && \
+        -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#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 && \
     git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \
@@ -92,6 +95,10 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
         git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
         -rthirdparty-requirements.txt && \
+    python3 -m pip install --src /src \
+        -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
+        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+        doctor-tests && \
     mkdir -p /etc/rally && \
     printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \
     mkdir -p /var/lib/rally/database && rally-manage db create && \