X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=build.sh;h=3ddfdb55b2cd4053271471d872b00f84fd3e0296;hb=4f7c559e6cc337a6f222b2dd3c4a5f4a143a1e6d;hp=eff3f6b6dd20cb24e79940938b543fdb05c0d02a;hpb=4ef1169759eaeb39144ac7e2a3f814ea86af7a67;p=functest.git

diff --git a/build.sh b/build.sh
index eff3f6b6d..3ddfdb55b 100644
--- a/build.sh
+++ b/build.sh
@@ -5,17 +5,19 @@ set -e
 repo=${REPO:-opnfv}
 amd64_dirs=${amd64_dirs-"\
 docker/core \
-docker/tempest \
 docker/healthcheck \
 docker/smoke \
 docker/benchmarking \
-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/benchmarking \
+docker/smoke-cntt \
+docker/benchmarking-cntt"}
 arm64_dirs=${arm64_dirs-${amd64_dirs}}
 build_opts=("--pull=true" --no-cache "--force-rm=true")
 
@@ -32,11 +34,11 @@ for dir in ${amd64_dirs}; do
         (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true)
 done
 [ -n "${amd64_dirs}" ] &&
-    (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.10 || true)
+    (docker rmi "${repo}/functest-core:amd64-latest" alpine:edge || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|alpine:3.10|multiarch/alpine:arm64-v3.10|g" {} +
+    -e "s|alpine:edge|arm64v8/alpine:edge|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,11 +52,11 @@ for dir in ${arm64_dirs}; do
 done
 [ -n "${arm64_dirs}" ] &&
     (docker rmi "${repo}/functest-core:arm64-latest" \
-        multiarch/alpine:arm64-v3.10 || true)
+        arm64v8/alpine:edge || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|alpine:3.10|multiarch/alpine:armhf-v3.10|g" {} +
+    -e "s|alpine:edge|arm32v6/alpine:edge|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,7 +70,7 @@ for dir in ${arm_dirs}; do
 done
 [ -n "${arm_dirs}" ] &&
     (docker rmi "${repo}/functest-core:arm-latest" \
-        multiarch/alpine:armhf-v3.10 || true)
+        arm32v6/alpine:edge || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?