X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build.sh;h=470b9d52be1282835ca2200de909370464af51fd;hb=e8cd8e7bd86a1b2d5fa952711ff854ed7b4982c2;hp=e384ce316d73a27cecbffc2d799f72f43b7ba9eb;hpb=e3281b2175ca9983d79ce17de7e7497f749e650e;p=functest.git

diff --git a/build.sh b/build.sh
index e384ce316..470b9d52b 100644
--- a/build.sh
+++ b/build.sh
@@ -2,38 +2,51 @@
 
 set -e
 
-repo=${repo:-opnfv}
+repo=${REPO:-opnfv}
 amd64_dirs=${amd64_dirs-"\
 docker/core \
+docker/tempest \
 docker/healthcheck \
 docker/smoke \
 docker/features \
 docker/components \
-docker/vnf \
-docker/parser \
-docker/restapi"}
-arm64_dirs=${arm64_dirs-$(echo "${amd64_dirs}" | sed -e "s|docker/vnf||" \
-    -e "s|docker/restapi||")}
+docker/vnf"}
+arm64_dirs=${arm64_dirs-${amd64_dirs}}
+build_opts=(--pull=true --no-cache --force-rm=true \
+    --build-arg OPENSTACK_TAG="${OPENSTACK_TAG:-stable/queens}")
 
-find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} +
-if [[ ${amd64_dirs} != *"docker/core"* ]]; then
-    docker pull "${repo}/functest-core:amd64-latest"
-fi
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-tempest|${repo}/functest-tempest:amd64-latest|g" {} +
 for dir in ${amd64_dirs}; do
-    (cd "${dir}" && docker build --no-cache -t "${repo}/functest-${dir##**/}:amd64-latest" .)
-    docker push "${repo}/functest-${dir##**/}:amd64-latest"
+    (cd "${dir}" &&
+        docker build "${build_opts[@]}" \
+            -t "${repo}/functest-${dir##**/}:amd64-latest" .)
+        docker push "${repo}/functest-${dir##**/}:amd64-latest"
+    [ "${dir}" != "docker/core" ] &&
+        (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true)
 done
+[ ! -z "${amd64_dirs}" ] &&
+    (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.7 || true)
 find . -name Dockerfile -exec git checkout {} +
 
-find . -name Dockerfile -exec sed -i -e "s|alpine:3.6|multiarch/alpine:arm64-v3.6|g" {} +
-find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} +
-if [[ ${arm64_dirs} != *"docker/core"* ]]; then
-    docker pull "${repo}/functest-core:arm64-latest"
-fi
+find . -name Dockerfile -exec sed -i \
+    -e "s|alpine:3.7|multiarch/alpine:arm64-v3.7|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} +
+find . -name Dockerfile -exec sed -i \
+    -e "s|opnfv/functest-tempest|${repo}/functest-tempest:arm64-latest|g" {} +
 for dir in ${arm64_dirs}; do
-    (cd "${dir}" && docker build --no-cache -t "${repo}/functest-${dir##**/}:arm64-latest" .)
+    (cd "${dir}" && docker build "${build_opts[@]}" \
+        -t "${repo}/functest-${dir##**/}:arm64-latest" .)
     docker push "${repo}/functest-${dir##**/}:arm64-latest"
+    [ "${dir}" != "docker/core" ] &&
+        (docker rmi "${repo}/functest-${dir##**/}:arm64-latest" || true)
 done
+[ ! -z "${arm64_dirs}" ] &&
+    (docker rmi "${repo}/functest-core:arm64-latest" \
+        multiarch/alpine:arm64-v3.7 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?