X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build.sh;h=1e92b65a9b1dea1ab0b798585397a5b0c13034d4;hb=507ef682cfb0f05f843ab36e67b70db41f2863b4;hp=18356fed0dee2edba93a15f1b238a05ab3cbd6f9;hpb=07dc65bb64c34db0d657e7f57ffc033927869923;p=functest-kubernetes.git

diff --git a/build.sh b/build.sh
index 18356fed..1e92b65a 100644
--- a/build.sh
+++ b/build.sh
@@ -7,7 +7,8 @@ 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)
 
@@ -28,11 +29,12 @@ for dir in ${amd64_dirs}; do
 done
 [ ! -z "${amd64_dirs}" ] &&
     (docker rmi \
-        "${repo}/functest-kubernetes-core:amd64-hunter" golang:alpine3.8 || true)
+        "${repo}/functest-kubernetes-core:amd64-hunter" \
+        golang:1.11-alpine3.9 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|golang:alpine3.8|arm64v8/golang:alpine3.8|g" {} +
+    -e "s|golang:1.11-alpine3.9|arm64v8/golang:1.11-alpine3.9|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-kubernetes-core:hunter|\
 ${repo}/functest-kubernetes-core:arm64-hunter|g" {} +
@@ -49,7 +51,28 @@ for dir in ${arm64_dirs}; do
 done
 [ ! -z "${arm64_dirs}" ] &&
     (docker rmi "${repo}/functest-kubernetes-core:arm64-hunter" \
-        arm64v8/golang:alpine3.8 || true)
+        arm64v8/golang:1.11-alpine3.9 || true)
+find . -name Dockerfile -exec git checkout {} +
+
+find . -name Dockerfile -exec sed -i \
+    -e "s|golang:1.14-alpine3.12|arm32v7/golang:1.14-alpine3.12|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-kubernetes-core|\
+${repo}/functest-kubernetes-core:arm-hunter|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-kubernetes-healthcheck|\
+${repo}/functest-kubernetes-healthcheck: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.14-alpine3.12 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?