From 1cc94c2dca9c151839a3e595f5c9faca2e14be86 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 (cherry picked from commit e59aaac6625fcc78de636c90d0738aaf899f2757) --- build.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index bf4115ec6..5cd98efb4 100644 --- a/build.sh +++ b/build.sh @@ -18,9 +18,11 @@ build_opts=("--pull=true" --no-cache "--force-rm=true") find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core:leguer|${repo}/functest-core:amd64-leguer|g" {} + find . -name Dockerfile -exec sed -i \ - -e \ - "s|opnfv/functest-tempest:leguer|${repo}/functest-tempest:amd64-leguer|g" \ + -e "s|opnfv/functest-smoke:leguer|${repo}/functest-smoke:amd64-leguer|g" \ {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-benchmarking:leguer|\ +${repo}/functest-benchmarking:amd64-leguer|g" {} + for dir in ${amd64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ @@ -38,9 +40,11 @@ find . -name Dockerfile -exec sed -i \ find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core:leguer|${repo}/functest-core:arm64-leguer|g" {} + find . -name Dockerfile -exec sed -i \ - -e \ - "s|opnfv/functest-tempest:leguer|${repo}/functest-tempest:arm64-leguer|g" \ + -e "s|opnfv/functest-smoke:leguer|${repo}/functest-smoke:arm64-leguer|g" \ {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-benchmarking:leguer|\ +${repo}/functest-benchmarking:arm64-leguer|g" {} + for dir in ${arm64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ -t "${repo}/functest-${dir##**/}:arm64-leguer" .) @@ -58,9 +62,11 @@ find . -name Dockerfile -exec sed -i \ find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core:leguer|${repo}/functest-core:arm-leguer|g" {} + find . -name Dockerfile -exec sed -i \ - -e \ - "s|opnfv/functest-tempest:leguer|${repo}/functest-tempest:arm-leguer|g" \ + -e "s|opnfv/functest-smoke:leguer|${repo}/functest-smoke:arm-leguer|g" \ {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-benchmarking:leguer|\ +${repo}/functest-benchmarking:arm-leguer|g" {} + for dir in ${arm_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ -t "${repo}/functest-${dir##**/}:arm-leguer" .) -- cgit 1.2.3-korg