aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-10-04 16:20:27 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-10-04 16:32:13 +0200
commitac4674ce4ead2c61d7904ec60cf0465009a0b50b (patch)
treea85a056bf7be5955b493c7dff33bf8603aedaf21
parentac0915b769787ccebd61169e037ff9b261511c27 (diff)
Modify smoke and benchmarking in Docker From
Change-Id: I0d7acd82f3a4305e862e924d1199c5d28d3ccf56 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit e50c0a670fa1dadd49ce6070bcdd2228d9478a7d)
-rw-r--r--build.sh21
1 files changed, 12 insertions, 9 deletions
diff --git a/build.sh b/build.sh
index 8d187c78a..d25c6792a 100644
--- a/build.sh
+++ b/build.sh
@@ -18,9 +18,10 @@ build_opts=("--pull=true" --no-cache "--force-rm=true")
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-core:jerma|${repo}/functest-core:amd64-jerma|g" {} +
find . -name Dockerfile -exec sed -i \
- -e \
- "s|opnfv/functest-tempest:jerma|${repo}/functest-tempest:amd64-jerma|g" \
- {} +
+ -e "s|opnfv/functest-smoke:jerma|${repo}/functest-smoke:amd64-jerma|g" {} +
+find . -name Dockerfile -exec sed -i \
+ -e "s|opnfv/functest-benchmarking:jerma|\
+${repo}/functest-benchmarking:amd64-jerma|g" {} +
for dir in ${amd64_dirs}; do
(cd "${dir}" &&
docker build "${build_opts[@]}" \
@@ -38,9 +39,10 @@ find . -name Dockerfile -exec sed -i \
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-core:jerma|${repo}/functest-core:arm64-jerma|g" {} +
find . -name Dockerfile -exec sed -i \
- -e \
- "s|opnfv/functest-tempest:jerma|${repo}/functest-tempest:arm64-jerma|g" \
- {} +
+ -e "s|opnfv/functest-smoke:jerma|${repo}/functest-smoke:arm64-jerma|g" {} +
+find . -name Dockerfile -exec sed -i \
+ -e "s|opnfv/functest-benchmarking:jerma|\
+${repo}/functest-benchmarking:arm64-jerma|g" {} +
for dir in ${arm64_dirs}; do
(cd "${dir}" && docker build "${build_opts[@]}" \
-t "${repo}/functest-${dir##**/}:arm64-jerma" .)
@@ -58,9 +60,10 @@ find . -name Dockerfile -exec sed -i \
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-core:jerma|${repo}/functest-core:arm-jerma|g" {} +
find . -name Dockerfile -exec sed -i \
- -e \
- "s|opnfv/functest-tempest:jerma|${repo}/functest-tempest:arm-jerma|g" \
- {} +
+ -e "s|opnfv/functest-smoke:jerma|${repo}/functest-smoke:arm-jerma|g" {} +
+find . -name Dockerfile -exec sed -i \
+ -e "s|opnfv/functest-benchmarking:jerma|\
+${repo}/functest-benchmarking:arm-jerma|g" {} +
for dir in ${arm_dirs}; do
(cd "${dir}" && docker build "${build_opts[@]}" \
-t "${repo}/functest-${dir##**/}:arm-jerma" .)