From 4b82bb7aa4d9f3992c6d56fcf4a4a3c399564b1a Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 1 Sep 2017 14:53:10 +0200 Subject: Fix all rally requirements on-the-fly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- docker/core/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'docker/core') diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index ebd76a262..df8ce8351 100644 --- 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 && \ -- cgit 1.2.3-korg