diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-10-30 09:52:34 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-10-30 10:59:41 +0100 |
| commit | ff34df7ec7be6cd5fcf0f7557b393bd5d6266047 (patch) | |
| tree | 417a63efe2b75fefb02dda086306c024062d3b2c /docker/Dockerfile | |
| parent | 945b4412574d87a1ed700e59fa8ffeea92dc9e0d (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/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index a6de3db4..8d43c371 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 \ |