aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-09-01 15:42:24 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-01 15:42:24 +0000
commitd9c60d672e04c499bde75d8a98e1e235e6374baf (patch)
treebc087dea1b1a71fb3e06877dfdad2ca01dc79c9f
parent7bfeff28964ead89c97a524acfae0e7541fa6d55 (diff)
parent4b82bb7aa4d9f3992c6d56fcf4a4a3c399564b1a (diff)
Merge "Fix all rally requirements on-the-fly"
-rw-r--r--docker/Dockerfile6
-rw-r--r--docker/core/Dockerfile7
-rw-r--r--requirements.txt3
-rw-r--r--upper-constraints.txt2
4 files changed, 14 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d60ce53b3..66bd31ac9 100644
--- 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 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 && \
diff --git a/requirements.txt b/requirements.txt
index 234be1685..afd5305d2 100644
--- 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 fae94270c..2c5cd315d 100644
--- 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