Clone rally-openstack in functest-smoke

It allows getting latest changes verifying Gnocchi.
Former neutron tempest tests are also removed.

Change-Id: I5910ca012b72b1c5bfb9b0f52591cc9e03051f47
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index d4415ce..9bb98be 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -29,23 +29,19 @@ RUN apk --no-cache add --virtual .build-deps --update \
     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 /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/neutron-tempest-plugin && \
+        /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 && \

diff --git a/upper-constraints.txt b/upper-constraints.txt
index 716cffc..820f8d4 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -22,4 +22,3 @@ flasgger===0.6.6
 xtesting===0.41.0
 networking-bgpvpn===8.0.0
 sphinx-opnfv-theme===0.1.1
-rally-openstack===1.0.0