X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=build.sh;h=c5f8eeb5fb5794b115ed07e20c3ad24b586f4fc8;hb=6fa912328906d3073b6afe7acc2b39b2a895e538;hp=24aab9b0b5a990a2908345e5d841f861981310f4;hpb=a648c585200c7483c3ed82bdf8b654e1ea01cee7;p=functest-kubernetes.git

diff --git a/build.sh b/build.sh
index 24aab9b0..c5f8eeb5 100644
--- a/build.sh
+++ b/build.sh
@@ -7,17 +7,51 @@ amd64_dirs=${amd64_dirs-"\
 docker/core \
 docker/healthcheck \
 docker/smoke \
-docker/features"}
+docker/cnf \
+docker/security"}
+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-kubernetes-core|${repo}/functest-kubernetes-core|g" {} +
-find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-kubernetes-healthcheck|${repo}/functest-kubernetes-healthcheck|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-kubernetes-core|\
+${repo}/functest-kubernetes-core:amd64-latest|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-kubernetes-healthcheck|\
+${repo}/functest-kubernetes-healthcheck:amd64-latest|g" {} +
 for dir in ${amd64_dirs}; do
-    (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-kubernetes-${dir##**/}" .)
-    docker push "${repo}/functest-kubernetes-${dir##**/}"
-    [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-kubernetes-${dir##**/}" || true)
+    (cd "${dir}" &&
+        docker build "${build_opts[@]}" \
+            -t "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" .)
+        docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-latest"
+    [ "${dir}" != "docker/core" ] &&
+        (docker rmi \
+            "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" || true)
 done
-[ ! -z "${amd64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-healthcheck" "${repo}/functest-kubernetes-core" alpine:3.7 || true)
+[ ! -z "${amd64_dirs}" ] &&
+    (docker rmi \
+        "${repo}/functest-kubernetes-core:amd64-latest" \
+        golang:1.13-alpine3.12 || true)
+find . -name Dockerfile -exec git checkout {} +
+
+find . -name Dockerfile -exec sed -i \
+    -e "s|golang:1.14-alpine3.12|arm64v8/golang:1.14-alpine3.12|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-kubernetes-core|\
+${repo}/functest-kubernetes-core:arm64-latest|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-kubernetes-healthcheck|\
+${repo}/functest-kubernetes-healthcheck:arm64-latest|g" {} +
+for dir in ${arm64_dirs}; do
+    (cd "${dir}" && docker build "${build_opts[@]}" \
+        -t "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" .)
+    docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-latest"
+    [ "${dir}" != "docker/core" ] &&
+        (docker rmi \
+            "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" || true)
+done
+[ ! -z "${arm64_dirs}" ] &&
+    (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \
+        arm64v8/golang:1.14-alpine3.12 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?