X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build.sh;h=d6726d320bfa457eb4f1ccdb5e37ee238cf3586f;hb=8e297c49c481961959b29c2080cc059fcc84e9ee;hp=480fe61920df72dd01fffd840808f35efe8fb82e;hpb=5f525ebaf9d503aa641996fe2ac780dc9dda1774;p=functest.git

diff --git a/build.sh b/build.sh
index 480fe6192..d6726d320 100644
--- a/build.sh
+++ b/build.sh
@@ -5,21 +5,21 @@ set -e
 repo=${REPO:-opnfv}
 amd64_dirs=${amd64_dirs-"\
 docker/core \
-docker/tempest \
 docker/healthcheck \
 docker/smoke \
 docker/benchmarking \
-docker/features \
-docker/vnf"}
+docker/vnf \
+docker/smoke-cntt \
+docker/benchmarking-cntt"}
 arm_dirs=${arm_dirs-"\
 docker/core \
-docker/tempest \
 docker/healthcheck \
 docker/smoke \
 docker/benchmarking \
-docker/features"}
+docker/smoke-cntt \
+docker/benchmarking-cntt"}
 arm64_dirs=${arm64_dirs-${amd64_dirs}}
-build_opts=(--pull=true --no-cache --force-rm=true)
+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" {} +
@@ -33,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.9 || 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.9|multiarch/alpine:arm64-v3.9|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 \
@@ -50,13 +50,13 @@ 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.9 || true)
+        arm64v8/alpine:3.11 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|alpine:3.9|multiarch/alpine:armhf-v3.9|g" {} +
+    -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 \
@@ -68,9 +68,9 @@ for dir in ${arm_dirs}; do
     [ "${dir}" != "docker/core" ] &&
         (docker rmi "${repo}/functest-${dir##**/}:arm-latest" || true)
 done
-[ ! -z "${arm_dirs}" ] &&
+[ -n "${arm_dirs}" ] &&
     (docker rmi "${repo}/functest-core:arm-latest" \
-        multiarch/alpine:armhf-v3.9 || true)
+        arm32v6/alpine:3.11 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?