X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build.sh;h=c8d48751f165c642730cbbe35f2140464da48378;hb=bfcbc700f1981f359030f4baf89bd408ad07b1ea;hp=7941686283e6a687429c681eb5629f275fa1d52b;hpb=5d10d8e987e102a84699b8d8c16fbd7d6c04272f;p=functest-kubernetes.git

diff --git a/build.sh b/build.sh
index 79416862..c8d48751 100644
--- a/build.sh
+++ b/build.sh
@@ -7,8 +7,10 @@ amd64_dirs=${amd64_dirs-"\
 docker/core \
 docker/healthcheck \
 docker/smoke \
+docker/cnf \
 docker/security \
-docker/features"}
+docker/benchmarking"}
+arm_dirs=${arm_dirs-${amd64_dirs}}
 arm64_dirs=${arm64_dirs-${amd64_dirs}}
 build_opts=(--pull=true --no-cache --force-rm=true)
 
@@ -41,6 +43,9 @@ ${repo}/functest-kubernetes-core:arm64-hunter|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-kubernetes-healthcheck:hunter|\
 ${repo}/functest-kubernetes-healthcheck:arm64-hunter|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-kubernetes-smoke:hunter|\
+${repo}/functest-kubernetes-smoke:arm64-hunter|g" {} +
 for dir in ${arm64_dirs}; do
     (cd "${dir}" && docker build "${build_opts[@]}" \
         -t "${repo}/functest-kubernetes-${dir##**/}:arm64-hunter" .)
@@ -54,4 +59,28 @@ done
         arm64v8/golang:1.11-alpine3.9 || true)
 find . -name Dockerfile -exec git checkout {} +
 
+find . -name Dockerfile -exec sed -i \
+    -e "s|golang:1.11-alpine3.9|arm32v7/golang:1.11-alpine3.9|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-kubernetes-core:hunter|\
+${repo}/functest-kubernetes-core:arm-hunter|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-kubernetes-healthcheck:hunter|\
+${repo}/functest-kubernetes-healthcheck:arm-hunter|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-kubernetes-smoke:hunter|\
+${repo}/functest-kubernetes-smoke:arm-hunter|g" {} +
+for dir in ${arm_dirs}; do
+    (cd "${dir}" && docker build "${build_opts[@]}" \
+        -t "${repo}/functest-kubernetes-${dir##**/}:arm-hunter" .)
+    docker push "${repo}/functest-kubernetes-${dir##**/}:arm-hunter"
+    [ "${dir}" != "docker/core" ] &&
+        (docker rmi \
+            "${repo}/functest-kubernetes-${dir##**/}:arm-hunter" || true)
+done
+[ ! -z "${arm_dirs}" ] &&
+    (docker rmi "${repo}/functest-kubernetes-core:arm-hunter" \
+        arm32v7/golang:1.11-alpine3.9 || true)
+find . -name Dockerfile -exec git checkout {} +
+
 exit $?