From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 13 Oct 2017 07:33:38 +0000 (+0200)
Subject: Fix find calls in build.sh
X-Git-Tag: opnfv-5.0.RC1~17
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F44981%2F1;p=functest.git

Fix find calls in build.sh

It completes "Allow building aarch64 images" [1]

[1] https://gerrit.opnfv.org/gerrit/#/c/44931/

Change-Id: I5dcb98be7f296227693d3f889c9747d944bcc86d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/build.sh b/build.sh
index f16fa299f..c70ca0cf8 100644
--- a/build.sh
+++ b/build.sh
@@ -15,7 +15,7 @@ docker/restapi"}
 aarch64_dirs=${aarch64_dirs-$(echo "${x86_64_dirs}" | sed -e "s|docker/vnf||" \
     -e "s|docker/restapi||")}
 
-find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:x86_64-euphrates|g" {} +
+find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core:euphrates|${repo}/functest-core:x86_64-euphrates|g" {} +
 for dir in ${x86_64_dirs}; do
     (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:x86_64-euphrates" .)
     docker push "${repo}/functest-${dir##**/}:x86_64-euphrates"
@@ -23,7 +23,7 @@ done
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i -e "s|alpine:3.6|multiarch/alpine:aarch64-v3.6|g" {} +
-find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:aarch64-euphrates|g" {} +
+find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core:euphrates|${repo}/functest-core:aarch64-euphrates|g" {} +
 for dir in ${aarch64_dirs}; do
     (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:aarch64-euphrates" .)
     docker push "${repo}/functest-${dir##**/}:aarch64-euphrates"