X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build.sh;h=7074d8c5af7b37994e1b43faa938d8ab125b09fd;hb=refs%2Fchanges%2F61%2F53461%2F1;hp=3b46cb06e74d7953fa1a1fb13dbae6ca7976dcb6;hpb=b31ae2c8b59619251cffcba1f307e0b7b9acd89d;p=functest.git

diff --git a/build.sh b/build.sh
index 3b46cb06e..7074d8c5a 100644
--- a/build.sh
+++ b/build.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-repo=${repo:-opnfv}
-x86_64_dirs=${x86_64_dirs-"\
+repo=${REPO:-opnfv}
+amd64_dirs=${amd64_dirs-"\
 docker/core \
 docker/healthcheck \
 docker/smoke \
@@ -11,23 +11,28 @@ docker/features \
 docker/components \
 docker/vnf \
 docker/parser \
+docker/patrole \
 docker/restapi"}
-aarch64_dirs=${aarch64_dirs-$(echo "${x86_64_dirs}" | sed -e "s|docker/vnf||" \
-    -e "s|docker/restapi||")}
+arm64_dirs=${arm64_dirs-${amd64_dirs}}
+build_opts=(--pull=true --no-cache --force-rm=true)
 
-find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:x86_64-latest|g" {} +
-for dir in ${x86_64_dirs}; do
-    (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:x86_64-latest" .)
-    docker push "${repo}/functest-${dir##**/}:x86_64-latest"
+find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} +
+for dir in ${amd64_dirs}; do
+    (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-${dir##**/}:amd64-latest" .)
+    docker push "${repo}/functest-${dir##**/}:amd64-latest"
+    [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true)
 done
+[ ! -z "${amd64_dirs}" ] && (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.7 || true)
 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-latest|g" {} +
-for dir in ${aarch64_dirs}; do
-    (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:aarch64-latest" .)
-    docker push "${repo}/functest-${dir##**/}:aarch64-latest"
+find . -name Dockerfile -exec sed -i -e "s|alpine:3.7|multiarch/alpine:arm64-v3.7|g" {} +
+find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} +
+for dir in ${arm64_dirs}; do
+    (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-${dir##**/}:arm64-latest" .)
+    docker push "${repo}/functest-${dir##**/}:arm64-latest"
+    [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:arm64-latest" || true)
 done
+[ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-latest" multiarch/alpine:arm64-v3.7 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?