From e50c0a670fa1dadd49ce6070bcdd2228d9478a7d Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 4 Oct 2020 16:20:27 +0200 Subject: Modify smoke and benchmarking in Docker From MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0d7acd82f3a4305e862e924d1199c5d28d3ccf56 Signed-off-by: Cédric Ollivier --- build.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index ab02bb2a5..5331a52a4 100644 --- a/build.sh +++ b/build.sh @@ -18,7 +18,10 @@ 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" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-tempest|${repo}/functest-tempest:amd64-latest|g" {} + + -e "s|opnfv/functest-smoke|${repo}/functest-smoke:amd64-latest|g" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-benchmarking|\ +${repo}/functest-benchmarking:amd64-latest|g" {} + for dir in ${amd64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ @@ -36,7 +39,10 @@ find . -name Dockerfile -exec sed -i \ find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-tempest|${repo}/functest-tempest:arm64-latest|g" {} + + -e "s|opnfv/functest-smoke|${repo}/functest-smoke:arm64-latest|g" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-benchmarking|\ +${repo}/functest-benchmarking:arm64-latest|g" {} + for dir in ${arm64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ -t "${repo}/functest-${dir##**/}:arm64-latest" .) @@ -54,7 +60,10 @@ find . -name Dockerfile -exec sed -i \ find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core|${repo}/functest-core:arm-latest|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-tempest|${repo}/functest-tempest:arm-latest|g" {} + + -e "s|opnfv/functest-smoke|${repo}/functest-smoke:arm-latest|g" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-benchmarking|\ +${repo}/functest-benchmarking:arm-latest|g" {} + for dir in ${arm_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ -t "${repo}/functest-${dir##**/}:arm-latest" .) -- cgit 1.2.3-korg