Fix all rally requirements on-the-fly

Rally is released out of OpenStack releases and its requirements must
be modified before installing. Rally applies a similar solution for
gating [1].

[1] https://github.com/openstack/rally/blob/stable/0.9/tests/ci/sync_requirements.py

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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d60ce53..66bd31a 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,7 +13,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container"
 
 # Environment variables
 ARG BRANCH=master
-ARG RALLY_TAG=0.8.1
+ARG RALLY_TAG=stable/0.9
 ARG ODL_TAG=release/carbon
 ARG OPENSTACK_TAG=stable/ocata
 ARG VIMS_TAG=stable
@@ -79,6 +79,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 && \
+    git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
+    update-requirements -s --source /src/openstack-requirements /src/rally/ && \
+    pip install --no-cache-dir --src /src -cupper-constraints.txt \
+        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH /src/rally/ && \
     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 && \

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index ebd76a2..df8ce83 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -2,6 +2,7 @@ FROM alpine:3.6
 
 ARG BRANCH=master
 ARG OPENSTACK_TAG=stable/ocata
+ARG RALLY_TAG=stable/0.9
 
 RUN apk --no-cache add --update \
         python libffi libssl1.0 libjpeg-turbo py-pip bash \
@@ -15,7 +16,11 @@ RUN apk --no-cache add --update \
     pip install --no-cache-dir --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 && \
-    rm upper-constraints.txt && \
+    git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
+    update-requirements -s --source /src/openstack-requirements /src/rally/ && \
+    pip install --no-cache-dir --src /src -cupper-constraints.txt \
+        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH /src/rally/ && \
+    rm -r upper-constraints.txt /src/rally/.git /src/openstack-requirements/.git && \
     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 && \

diff --git a/requirements.txt b/requirements.txt
index 234be16..afd5305 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,5 +29,6 @@ PrettyTable<0.8,>=0.7.1 # BSD
 six>=1.9.0 # MIT
 opnfv
 snaps
-rally
 tempest>=12.1.0 # Apache-2.0
+openstack_requirements
+SQLAlchemy

diff --git a/upper-constraints.txt b/upper-constraints.txt
index fae9427..2c5cd31 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -13,5 +13,5 @@ robotframework===3.0.2
 robotframework-httplibrary===0.4.2
 robotframework-requests===0.4.7
 robotframework-sshlibrary===2.1.3;python_version=='2.7'
-rally===0.9.1
 IPy===0.83
+-e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack_requirements