summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-08-15 09:17:07 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-08-15 09:17:07 +0000
commitb2426d6614cbeeabe61d9258e42e7eca43bfde6e (patch)
treec11eb3840e9bf2b38c8a9997ee01e3131a4cf1ed
parent871400382c339114aedb529a5b6a7bbdd2067b46 (diff)
parent5c02d598bf827d632c2933cf4ed7a7e718318d11 (diff)
Merge "Allow overriding rally-tag if OpenStack master"
-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" {} +