Install Cloudify descritors in functest-vnf

[functest.git] / docker / smoke / Dockerfile

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 252f101..9bb98be 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -6,7 +6,7 @@ ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
 ARG RALLY_TAG=0.11.2
 ARG OS_FAULTS_TAG=0.1.17
 ARG REFSTACK_TARGET=2017.09
-ARG PATROLE_TAG=0.2.0
+ARG PATROLE_TAG=0.3.0
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
 RUN apk --no-cache add --virtual .build-deps --update \
@@ -18,30 +18,30 @@ RUN apk --no-cache add --virtual .build-deps --update \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
         -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \
-    git clone --depth 1 https://github.com/openstack/os-faults.git -b $OS_FAULTS_TAG /src/os-faults && \
+    git clone https://github.com/openstack/os-faults.git /src/os-faults && \
+    (cd /src/os-faults && git checkout $OS_FAULTS_TAG) && \
     update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \
-    git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
+    git clone https://github.com/openstack/rally.git /src/rally && \
+    (cd /src/rally && git checkout $RALLY_TAG) && \
     update-requirements -s --source /src/openstack-requirements /src/rally/ && \
     git clone https://github.com/openstack/patrole.git /src/patrole && \
     (cd /src/patrole && git checkout $PATROLE_TAG) && \
     update-requirements -s --source /src/openstack-requirements /src/patrole/ && \
+    git clone --depth 1 https://github.com/openstack/neutron-tempest-plugin.git /src/neutron-tempest-plugin && \
+    update-requirements -s --source /src/openstack-requirements /src/neutron-tempest-plugin && \
+    git clone --depth 1 https://github.com/openstack/rally-openstack.git /src/rally-openstack && \
+    update-requirements -s --source /src/openstack-requirements /src/rally-openstack && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        tempest rally-openstack /src/os-faults && \
+        tempest /src/rally-openstack /src/os-faults && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        /src/rally /src/patrole -rthirdparty-requirements.txt && \
+        /src/rally /src/patrole /src/neutron-tempest-plugin -rthirdparty-requirements.txt && \
     git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
     (cd /src/odl_test && git checkout $ODL_TAG) && \
     virtualenv --system-site-packages /src/tempest/.venv && \
-    pip install --no-cache-dir --src /src -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        -e git+https://github.com/openstack/neutron.git@$OPENSTACK_TAG#egg=neutron && \
-    pip install --no-cache-dir --src /src -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        -r /src/neutron/test-requirements.txt && \
     rm -r upper-constraints.txt thirdparty-requirements.txt /src/odl_test/.git \
-        /src/os-faults /src/rally && \
+        /src/os-faults /src/rally /src/rally-openstack /src/neutron-tempest-plugin && \
     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 db create && \