X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build.sh;h=d6726d320bfa457eb4f1ccdb5e37ee238cf3586f;hb=a5d8fadf7a0c68df662c8257947df82119bfe768;hp=c3bc57bf2e3252b63d50913cbc8ffc639a53eaca;hpb=8f8f600106c038138845b3ddc527aebc9055f4a8;p=functest.git

diff --git a/build.sh b/build.sh
index c3bc57bf2..d6726d320 100644
--- a/build.sh
+++ b/build.sh
@@ -5,17 +5,21 @@ set -e
 repo=${REPO:-opnfv}
 amd64_dirs=${amd64_dirs-"\
 docker/core \
-docker/tempest \
 docker/healthcheck \
 docker/smoke \
 docker/benchmarking \
-docker/features \
-docker/components \
-docker/vnf"}
+docker/vnf \
+docker/smoke-cntt \
+docker/benchmarking-cntt"}
+arm_dirs=${arm_dirs-"\
+docker/core \
+docker/healthcheck \
+docker/smoke \
+docker/benchmarking \
+docker/smoke-cntt \
+docker/benchmarking-cntt"}
 arm64_dirs=${arm64_dirs-${amd64_dirs}}
-build_opts=(--pull=true --no-cache --force-rm=true \
-    --build-arg OPENSTACK_TAG="${OPENSTACK_TAG:-stable/queens}" \
-    --build-arg RALLY_OPENSTACK_TAG="${RALLY_OPENSTACK_TAG:-1.2.0}")
+build_opts=("--pull=true" --no-cache "--force-rm=true")
 
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} +
@@ -29,12 +33,12 @@ for dir in ${amd64_dirs}; do
     [ "${dir}" != "docker/core" ] &&
         (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true)
 done
-[ ! -z "${amd64_dirs}" ] &&
-    (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.8 || true)
+[ -n "${amd64_dirs}" ] &&
+    (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.11 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|alpine:3.8|multiarch/alpine:arm64-v3.8|g" {} +
+    -e "s|alpine:3.11|arm64v8/alpine:3.11|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} +
 find . -name Dockerfile -exec sed -i \
@@ -46,9 +50,27 @@ for dir in ${arm64_dirs}; do
     [ "${dir}" != "docker/core" ] &&
         (docker rmi "${repo}/functest-${dir##**/}:arm64-latest" || true)
 done
-[ ! -z "${arm64_dirs}" ] &&
+[ -n "${arm64_dirs}" ] &&
     (docker rmi "${repo}/functest-core:arm64-latest" \
-        multiarch/alpine:arm64-v3.8 || true)
+        arm64v8/alpine:3.11 || true)
+find . -name Dockerfile -exec git checkout {} +
+
+find . -name Dockerfile -exec sed -i \
+    -e "s|alpine:3.11|arm32v6/alpine:3.11|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-core|${repo}/functest-core:arm-latest|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-tempest|${repo}/functest-tempest:arm-latest|g" {} +
+for dir in ${arm_dirs}; do
+    (cd "${dir}" && docker build "${build_opts[@]}" \
+        -t "${repo}/functest-${dir##**/}:arm-latest" .)
+    docker push "${repo}/functest-${dir##**/}:arm-latest"
+    [ "${dir}" != "docker/core" ] &&
+        (docker rmi "${repo}/functest-${dir##**/}:arm-latest" || true)
+done
+[ -n "${arm_dirs}" ] &&
+    (docker rmi "${repo}/functest-core:arm-latest" \
+        arm32v6/alpine:3.11 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?