summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-08-14 23:07:43 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-08-14 23:19:14 +0200
commit5c02d598bf827d632c2933cf4ed7a7e718318d11 (patch)
treee73f3b11c965fc16b6e92bd06a55ad5ca46304c8
parent1bcc28012a78339063a7c93e16cdd9342aabb407 (diff)
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>
-rw-r--r--build.sh3
1 files changed, 2 insertions, 1 deletions
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" {} +