From: Cédric Ollivier Date: Sun, 4 Oct 2020 14:20:27 +0000 (+0200) Subject: Modify smoke and benchmarking in Docker From X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=db03eff9abbbcf933d2a409e29342b1a4c8e35b8;p=functest.git Modify smoke and benchmarking in Docker From Change-Id: I0d7acd82f3a4305e862e924d1199c5d28d3ccf56 Signed-off-by: Cédric Ollivier (cherry picked from commit e50c0a670fa1dadd49ce6070bcdd2228d9478a7d) --- diff --git a/build.sh b/build.sh index 160791b58..831f944d6 100644 --- a/build.sh +++ b/build.sh @@ -23,6 +23,12 @@ find . -name Dockerfile -exec sed -i \ -e \ "s|opnfv/functest-tempest:hunter|${repo}/functest-tempest:amd64-hunter|g" \ {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-smoke:hunter|${repo}/functest-smoke:amd64-hunter|g" \ + {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-benchmarking:hunter|\ +${repo}/functest-benchmarking:amd64-hunter|g" {} + for dir in ${amd64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ @@ -43,6 +49,12 @@ find . -name Dockerfile -exec sed -i \ -e \ "s|opnfv/functest-tempest:hunter|${repo}/functest-tempest:arm64-hunter|g" \ {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-smoke:hunter|${repo}/functest-smoke:arm64-hunter|g" \ + {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-benchmarking:hunter|\ +${repo}/functest-benchmarking:arm64-hunter|g" {} + for dir in ${arm64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ -t "${repo}/functest-${dir##**/}:arm64-hunter" .) @@ -63,6 +75,11 @@ find . -name Dockerfile -exec sed -i \ -e \ "s|opnfv/functest-tempest:hunter|${repo}/functest-tempest:arm-hunter|g" \ {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-smoke:hunter|${repo}/functest-smoke:arm-hunter|g" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-benchmarking:hunter|\ +${repo}/functest-benchmarking:arm-hunter|g" {} + for dir in ${arm_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ -t "${repo}/functest-${dir##**/}:arm-hunter" .)