From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 14 Aug 2018 21:07:43 +0000 (+0200)
Subject: Allow overriding rally-tag if OpenStack master
X-Git-Tag: opnfv-7.0.0~117^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F63%2F60963%2F1;p=functest.git

Allow overriding rally-tag if OpenStack master

It allows setting a newer rally-openstack tag in ollivier containers
to include "Fix the gates about cinder" [1].

TypeError: create() got an unexpected keyword argument 'source_replica'

[1] https://github.com/openstack/rally-openstack/commit/67882d55ca453d6aa863d279ec4cfc2b52c80f0a
[2] https://bugs.launchpad.net/rally/+bug/1785519

Change-Id: I5ed1002f345b0a9c51783850d09d0f336d0ed3d9
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/build.sh b/build.sh
index 470b9d52b..8610330f6 100644
--- a/build.sh
+++ b/build.sh
@@ -13,7 +13,8 @@ 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/queens}")
+    --build-arg OPENSTACK_TAG="${OPENSTACK_TAG:-stable/queens}" \
+    --build-arg RALLY_OPENSTACK_TAG="${RALLY_OPENSTACK_TAG:-1.2.0}")
 
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} +