From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 13 Sep 2018 12:47:53 +0000 (+0200)
Subject: Update rally to conform with cinder micro API
X-Git-Tag: opnfv-8.0.0~58
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=50304955efaa76c9f4bbbf30b4397036b758b805;p=functest.git

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>
(cherry picked from commit 829a502dfadc5dcdea75a0eda0b07cf15fe03dcd)
---

diff --git a/build.sh b/build.sh
index fae5ebd34..a0960eebb 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:-stable/rocky}" \
-    --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:hunter|${repo}/functest-core:amd64-hunter|g" {} +
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index 162a34225..67521f8d1 100644
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -3,7 +3,7 @@ FROM opnfv/functest-core:hunter
 ARG BRANCH=stable/hunter
 ARG OPENSTACK_TAG=stable/queens
 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 \