X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build.sh;h=e98eb69ce479ed704f78ec285a1d68ac89315019;hb=cf40e38be4d85c235a9d85a15f7fa326ebf356e6;hp=70dc1c5922bc228531f80056d991a57b76e4c168;hpb=bd3954bef4febc3d56568efe5fd6dabd39af791f;p=functest-kubernetes.git

diff --git a/build.sh b/build.sh
index 70dc1c59..e98eb69c 100644
--- a/build.sh
+++ b/build.sh
@@ -6,7 +6,11 @@ repo=${REPO:-opnfv}
 amd64_dirs=${amd64_dirs-"\
 docker/core \
 docker/healthcheck \
-docker/smoke"}
+docker/smoke \
+docker/cnf \
+docker/security \
+docker/benchmarking"}
+arm_dirs=${arm_dirs-${amd64_dirs}}
 arm64_dirs=${arm64_dirs-${amd64_dirs}}
 build_opts=(--pull=true --no-cache --force-rm=true)
 
@@ -28,17 +32,20 @@ done
 [ ! -z "${amd64_dirs}" ] &&
     (docker rmi \
         "${repo}/functest-kubernetes-core:amd64-latest" \
-        golang:1.13-alpine3.10 || true)
+        alpine:3.15 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|golang:1.13-alpine3.10|arm64v8/golang:1.13-alpine3.10|g" {} +
+    -e "s|alpine:3.15|arm64v8/alpine:3.15|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" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-kubernetes-smoke|\
+${repo}/functest-kubernetes-smoke:arm64-latest|g" {} +
 for dir in ${arm64_dirs}; do
     (cd "${dir}" && docker build "${build_opts[@]}" \
         -t "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" .)
@@ -49,7 +56,31 @@ for dir in ${arm64_dirs}; do
 done
 [ ! -z "${arm64_dirs}" ] &&
     (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \
-        arm64v8/golang:1.13-alpine3.10 || true)
+        arm64v8/alpine:3.15 || true)
+find . -name Dockerfile -exec git checkout {} +
+
+find . -name Dockerfile -exec sed -i \
+    -e "s|alpine:3.15|arm32v7/alpine:3.15|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-kubernetes-core|\
+${repo}/functest-kubernetes-core:arm-latest|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-kubernetes-healthcheck|\
+${repo}/functest-kubernetes-healthcheck:arm-latest|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-kubernetes-smoke|\
+${repo}/functest-kubernetes-smoke:arm-latest|g" {} +
+for dir in ${arm_dirs}; do
+    (cd "${dir}" && docker build "${build_opts[@]}" \
+        -t "${repo}/functest-kubernetes-${dir##**/}:arm-latest" .)
+    docker push "${repo}/functest-kubernetes-${dir##**/}:arm-latest"
+    [ "${dir}" != "docker/core" ] &&
+        (docker rmi \
+            "${repo}/functest-kubernetes-${dir##**/}:arm-latest" || true)
+done
+[ ! -z "${arm_dirs}" ] &&
+    (docker rmi "${repo}/functest-kubernetes-core:arm-latest" \
+        arm32v7/alpine:3.15 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?