summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-10-30 09:52:34 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-10-30 10:59:41 +0100
commitff34df7ec7be6cd5fcf0f7557b393bd5d6266047 (patch)
tree417a63efe2b75fefb02dda086306c024062d3b2c /docker
parent945b4412574d87a1ed700e59fa8ffeea92dc9e0d (diff)
Update Rally to 0.10
It requires to sync os-faults with OpenStack requirements as it's out-of-tree too. The last os-faults version is selected as well. Change-Id: I0c582070a937b6ba6cba5b0c17673f42ea5d6dec Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile7
-rw-r--r--docker/core/Dockerfile10
-rw-r--r--docker/parser/Dockerfile10
3 files changed, 19 insertions, 8 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a6de3db4e..8d43c371a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,7 +13,8 @@ LABEL version="0.1" description="OPNFV Functest Docker container"
# Environment variables
ARG BRANCH=master
-ARG RALLY_TAG=stable/0.9
+ARG RALLY_TAG=stable/0.10
+ARG OS_FAULTS_TAG=0.1.16
ARG ODL_TAG=e12ba90cd27577c4c6c70ee54f7d599b5f6777ba
ARG OPENSTACK_TAG=stable/ocata
ARG VIMS_TAG=stable
@@ -84,6 +85,8 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
pip install --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 && \
+ 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 && \
update-requirements -s --source /src/openstack-requirements /src/rally && \
git clone https://github.com/openstack/refstack-client.git /src/refstack-client && \
@@ -91,7 +94,7 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
update-requirements -s --source /src/openstack-requirements /src/refstack-client && \
pip install --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- /src/rally -e/src/refstack-client && \
+ /src/os-faults /src/rally -e/src/refstack-client && \
pip install --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 \
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 952e7c634..1cf0c8545 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -2,7 +2,8 @@ FROM alpine:3.6
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/ocata
-ARG RALLY_TAG=stable/0.9
+ARG RALLY_TAG=stable/0.10
+ARG OS_FAULTS_TAG=0.1.16
RUN apk --no-cache add --update \
python libffi libssl1.0 libjpeg-turbo py-pip bash \
@@ -17,14 +18,17 @@ 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 \
-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 && \
+ 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 && \
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 && \
+ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+ /src/os-faults /src/rally && \
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 -r upper-constraints.txt /src/rally/.git && \
+ rm -r upper-constraints.txt /src/os-faults/.git /src/rally/.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/docker/parser/Dockerfile b/docker/parser/Dockerfile
index d1996e914..6ab0d872c 100644
--- a/docker/parser/Dockerfile
+++ b/docker/parser/Dockerfile
@@ -2,7 +2,8 @@ FROM alpine:3.6
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/pike
-ARG RALLY_TAG=stable/0.9
+ARG RALLY_TAG=stable/0.10
+ARG OS_FAULTS_TAG=0.1.16
RUN apk --no-cache add --update \
python libffi libssl1.0 libjpeg-turbo py-pip bash \
@@ -18,17 +19,20 @@ 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 \
-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 && \
+ 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 && \
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 && \
+ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+ /src/os-faults /src/rally && \
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 \
git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-heattranslator\&subdirectory=tosca2heat/heat-translator \
git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-toscaparser\&subdirectory=tosca2heat/tosca-parser \
-e git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-parser && \
- rm -r upper-constraints.txt /src/rally/.git && \
+ rm -r upper-constraints.txt /src/os-faults/.git /src/rally/.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 && \