summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-09-13 14:47:53 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-09-13 14:51:24 +0200
commit829a502dfadc5dcdea75a0eda0b07cf15fe03dcd (patch)
tree70b19dee0db81fc48ddd73a8927a15df5fe5beeb
parent1106c213ac1aa9fbbf731f5e619d295943d8c3e1 (diff)
Update rally to conform with cinder micro API
It was applied on ollivier containers to ensure rally can verify cinder [1]. [1] https://review.openstack.org/#/c/587314/ Change-Id: I579dca8e6c2c7b3d7f49bca7a6b0c14e18a8e907 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--build.sh4
-rw-r--r--docker/tempest/Dockerfile2
2 files changed, 2 insertions, 4 deletions
diff --git a/build.sh b/build.sh
index e326f563f..c6bbd85c3 100644
--- a/build.sh
+++ b/build.sh
@@ -13,9 +13,7 @@ docker/features \
docker/components \
docker/vnf"}
arm64_dirs=${arm64_dirs-${amd64_dirs}}
-build_opts=(--pull=true --no-cache --force-rm=true \
- --build-arg OPENSTACK_TAG="${OPENSTACK_TAG:-master}" \
- --build-arg RALLY_OPENSTACK_TAG="${RALLY_OPENSTACK_TAG:-1.2.0}")
+build_opts=(--pull=true --no-cache --force-rm=true)
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} +
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index 5f001a2ae..25146a266 100644
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -3,7 +3,7 @@ FROM opnfv/functest-core
ARG BRANCH=master
ARG OPENSTACK_TAG=master
ARG RALLY_TAG=1.1.0
-ARG RALLY_OPENSTACK_TAG=1.2.0
+ARG RALLY_OPENSTACK_TAG=67882d55ca453d6aa863d279ec4cfc2b52c80f0a
ARG OS_FAULTS_TAG=0.1.17
RUN apk --no-cache add --virtual .build-deps --update \